Fix: compiler warnings

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8471 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Strategic/Assignments.cpp

@@ -3018,7 +3018,6 @@ UINT8 CalculateRepairPointsForRepairman(SOLDIERTYPE *pSoldier, UINT16 *pusMaxPts
 UINT8 CalculateCleaningPointsForRepairman(SOLDIERTYPE *pSoldier, UINT16 *pusMaxPts )
 {
 	UINT32 usCleaningPts;
-	UINT16 usKitPts;
 
 	// oops, we have no cleaning kit
 	if ( pSoldier->GetObjectWithFlag( CLEANING_KIT ) == NULL )
@@ -3624,11 +3623,10 @@ BOOLEAN IsSoldierKnownAsMercInSector(SOLDIERTYPE *pSoldier, INT16 sMapX, INT16 s
 UINT16 ToolKitPoints(SOLDIERTYPE *pSoldier)
 {
 	UINT16 usKitpts=0;
-	UINT8 ubPocket;
 
 	// add up kit points
 	// CHRISL: Changed to dynamically determine max inventory locations.
-	for (ubPocket=HANDPOS; ubPocket < NUM_INV_SLOTS; ubPocket++)
+	for (int ubPocket=HANDPOS; ubPocket < NUM_INV_SLOTS; ++ubPocket)
 	{
 		if( Item[pSoldier->inv[ ubPocket ].usItem].toolkit )
 		{
@@ -3642,11 +3640,10 @@ UINT16 ToolKitPoints(SOLDIERTYPE *pSoldier)
 UINT16 CleaningKitPoints(SOLDIERTYPE *pSoldier)
 {
 	UINT16 usKitpts=0;
-	UINT8 ubPocket;
 
 	// add up kit points
 	// CHRISL: Changed to dynamically determine max inventory locations.
-	for (ubPocket=HANDPOS; ubPocket < NUM_INV_SLOTS; ubPocket++)
+	for (int ubPocket=HANDPOS; ubPocket < NUM_INV_SLOTS; ++ubPocket)
 	{
 		if( HasItemFlag( pSoldier->inv[ubPocket].usItem, CLEANING_KIT ) )
 		{
@@ -3659,12 +3656,11 @@ UINT16 CleaningKitPoints(SOLDIERTYPE *pSoldier)
 
 UINT16 TotalMedicalKitPoints(SOLDIERTYPE *pSoldier)
 {
-	UINT8 ubPocket;
 	UINT16 usKitpts=0;
 
 	// add up kit points of all medkits
 	// CHRISL: Changed to dynamically determine max inventory locations.
-	for (ubPocket = HANDPOS; ubPocket < NUM_INV_SLOTS; ubPocket++)
+	for (int ubPocket = HANDPOS; ubPocket < NUM_INV_SLOTS; ++ubPocket)
 	{
 		// NOTE: Here, we don't care whether these are MEDICAL BAGS or FIRST AID KITS!
 		if ( IsMedicalKitItem( &( pSoldier->inv[ ubPocket ] ) ) )

Strategic/Queen Command.cpp

@@ -1261,7 +1261,7 @@ void ProcessQueenCmdImplicationsOfDeath( SOLDIERTYPE *pSoldier )
 		{
 #ifdef JA2BETAVERSION
 				CHAR16 str[256];
-				swprintf( str, L"Attempting to process player group thinking it's an enemy group in ProcessQueenCmdImplicationsOfDeath()", pSoldier->ubGroupID );
+				swprintf( str, L"Attempting to process player group %d thinking it's an enemy group in ProcessQueenCmdImplicationsOfDeath()", pSoldier->ubGroupID );
 				DoScreenIndependantMessageBox( str, MSG_BOX_FLAG_OK, NULL );
 #endif
 			return;
@@ -1270,7 +1270,7 @@ void ProcessQueenCmdImplicationsOfDeath( SOLDIERTYPE *pSoldier )
 		{
 #ifdef JA2BETAVERSION
 			CHAR16 str[256];
-			swprintf( str, L"Attempting to process militia group thinking it's an enemy group in ProcessQueenCmdImplicationsOfDeath()", pSoldier->ubGroupID );
+			swprintf( str, L"Attempting to process militia group %d thinking it's an enemy group in ProcessQueenCmdImplicationsOfDeath()", pSoldier->ubGroupID );
 			DoScreenIndependantMessageBox( str, MSG_BOX_FLAG_OK, NULL );
 #endif
 			return;

Tactical/Animation Data.h

@@ -79,7 +79,7 @@ enum SoldierBodyTypes
 // RGM = Regular Male
 // (RG) = Body desc ( Regular - RG, Short Stocky ( SS ), etc
 // (M) = Sex, Male, female
-typedef enum
+typedef enum AnimationSurfaceTypes
 {
 	RGMBASICWALKING = 0,
 	RGMSTANDING,
@@ -615,7 +615,7 @@ BGMWITHSTONE,
 } AnimationSurfaceTypes;
 
 // Enumerations for struct data
-typedef enum
+enum
 {
 	S_STRUCT,
 	C_STRUCT,

Tactical/Interface Panels.cpp

@@ -345,8 +345,7 @@ extern UINT32 guiCurrentItemDescriptionScreen;
 
 extern UINT32 guiCurrentItemDescriptionScreen;
 
-
+enum
-typedef enum
 {
 	STANCEUP_IMAGES = 0,
 	UPDOWN_IMAGES,
@@ -368,7 +367,7 @@ typedef enum
 	NUM_SM_BUTTON_IMAGES
 };
 
-typedef enum
+enum
 {
 	ENDTURN_IMAGES = 0,
 	ROSTERMODE_IMAGES,

Tactical/Interface Panels.h

@@ -1,8 +1,7 @@
 #ifndef __INTERFACE_PANELS
 #define __INTERFACE_PANELS
 
-
+enum
-typedef enum
 {
 	STANCEUP_BUTTON = 0,
 	UPDOWN_BUTTON,
@@ -22,8 +21,7 @@ typedef enum
 	NUM_SM_BUTTONS
 };
 
-
+enum
-typedef enum
 {
 	TEAM_DONE_BUTTON = 0,
 	TEAM_MAP_SCREEN_BUTTON,
@@ -36,7 +34,6 @@ typedef enum
 #define NEW_ITEM_CYCLES						4
 #define	NUM_TEAM_SLOTS						10
 
-
 #define	PASSING_ITEM_DISTANCE_OKLIFE		3
 #define	PASSING_ITEM_DISTANCE_NOTOKLIFE		2
 

Tactical/Interface.cpp

@@ -198,7 +198,7 @@ extern BOOLEAN gfUserTurnRegionActive;
 extern UINT8 gubSelectSMPanelToMerc;
 extern BOOLEAN gfIgnoreOnSelectedGuy;
 
-typedef enum
+enum
 {
 	WALK_IMAGES = 0,
 	SNEAK_IMAGES,

Tactical/Item Types.h

@@ -103,7 +103,7 @@ typedef enum INVENTORY_SLOT{
 	SMALLPOCK29POS,
 	SMALLPOCK30POS,
 	NUM_INV_SLOTS,
-};
+} INVENTORY_SLOT;
 
 #define		INV_START_POS		0
 #define		BODYPOSSTART		HELMETPOS
@@ -149,7 +149,8 @@ typedef enum ATTACHMENT_SLOT{
 	ATTACHMENTPOINT30,
 	ATTACHMENTPOINT31,
 	NUM_ATTACH_SLOTS
-};
+} ATTACHMENT_SLOT;
+
 #define INVALIDCURS 0
 #define QUESTCURS 1
 #define PUNCHCURS 2
@@ -1232,7 +1233,7 @@ typedef enum eLBE_CLASS	// Designation of lbeClass
 	BACKPACK,
 	LBE_POCKET,
 	OTHER_POCKET,
-};
+} eLBE_CLASS;
 
 
 class POCKETTYPE{
@@ -1263,7 +1264,7 @@ typedef enum ePOCKET_TYPE
 	GUNSLING_POCKET_TYPE = 1,
 	KNIFE_POCKET_TYPE = 2,
 	VEHICLE_POCKET_TYPE = 3,
-};
+} ePOCKET_TYPE;
 
 #define FIRST_WEAPON 1
 #define FIRST_AMMO 71

Tactical/Squads.cpp

@@ -1655,11 +1655,9 @@ BOOLEAN DoesVehicleExistInSquad( INT8 bSquadValue )
 
 void CheckSquadMovementGroups( void )
 {
-	INT32		iSquad;
-	INT8		iSoldier;
 	GROUP *		pGroup;
 
-	for( iSquad = 0; iSquad < NUMBER_OF_SQUADS; iSquad++ )
+	for(INT32 iSquad = 0; iSquad < NUMBER_OF_SQUADS; ++iSquad )
 	{
 		pGroup = GetGroup( SquadMovementGroups[ iSquad ] );
 		if ( pGroup == NULL )

TacticalAI/AIUtils.cpp

@@ -3986,7 +3986,6 @@ BOOLEAN FindBombNearby( SOLDIERTYPE *pSoldier, INT32 sGridNo, UINT8 ubDistance )
 {
 	UINT32	uiBombIndex;
 	INT32	sCheckGridno;
-	OBJECTTYPE *pObj;
 
 	INT16 sMaxLeft, sMaxRight, sMaxUp, sMaxDown, sXOffset, sYOffset;
 
@@ -3998,9 +3997,9 @@ BOOLEAN FindBombNearby( SOLDIERTYPE *pSoldier, INT32 sGridNo, UINT8 ubDistance )
 	sMaxUp   = min( ubDistance, (sGridNo / MAXROW));
 	sMaxDown = min( ubDistance, MAXROW - ((sGridNo / MAXROW) + 1));
 
-	for (sYOffset = -sMaxUp; sYOffset <= sMaxDown; sYOffset++)
+	for (sYOffset = -sMaxUp; sYOffset <= sMaxDown; ++sYOffset)
 	{
-		for (sXOffset = -sMaxLeft; sXOffset <= sMaxRight; sXOffset++)
+		for (sXOffset = -sMaxLeft; sXOffset <= sMaxRight; ++sXOffset)
 		{
 			sCheckGridno = sGridNo + sXOffset + (MAXCOL * sYOffset);
 
@@ -4010,7 +4009,7 @@ BOOLEAN FindBombNearby( SOLDIERTYPE *pSoldier, INT32 sGridNo, UINT8 ubDistance )
 			}
 
 			// search all bombs that we can see
-			for (uiBombIndex = 0; uiBombIndex < guiNumWorldBombs; uiBombIndex++)
+			for (uiBombIndex = 0; uiBombIndex < guiNumWorldBombs; ++uiBombIndex)
 			{
 				if (gWorldBombs[ uiBombIndex ].fExists &&
 					gWorldItems[ gWorldBombs[ uiBombIndex ].iItemIndex ].sGridNo == sCheckGridno &&

TileEngine/renderworld.cpp

@@ -107,7 +107,7 @@ extern	BOOLEAN	gfTopMessageDirty;
 #define	MAX_RENDERED_ITEMS					3
 
 // RENDERER FLAGS FOR DIFFERENT RENDER LEVELS
-typedef enum
+enum
 {
 	RENDER_STATIC_LAND,						RENDER_STATIC_OBJECTS,
 	RENDER_STATIC_SHADOWS,					RENDER_STATIC_STRUCTS,