From 2fe522db4b767056587e1c075bb7dd4bfae6ecfc Mon Sep 17 00:00:00 2001 From: Flugente Date: Wed, 13 Sep 2017 20:01:48 +0000 Subject: [PATCH] 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 | 10 +++------- Strategic/Queen Command.cpp | 4 ++-- Tactical/Animation Data.h | 4 ++-- Tactical/Interface Panels.cpp | 5 ++--- Tactical/Interface Panels.h | 7 ++----- Tactical/Interface.cpp | 2 +- Tactical/Item Types.h | 9 +++++---- Tactical/Squads.cpp | 4 +--- TacticalAI/AIUtils.cpp | 7 +++---- TileEngine/renderworld.cpp | 2 +- 10 files changed, 22 insertions(+), 32 deletions(-) diff --git a/Strategic/Assignments.cpp b/Strategic/Assignments.cpp index 9a2b2226..2ea4ab81 100644 --- a/Strategic/Assignments.cpp +++ b/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 ] ) ) ) diff --git a/Strategic/Queen Command.cpp b/Strategic/Queen Command.cpp index 9ea34465..02e7c13a 100644 --- a/Strategic/Queen Command.cpp +++ b/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; diff --git a/Tactical/Animation Data.h b/Tactical/Animation Data.h index 9ddb45bd..77a10ed2 100644 --- a/Tactical/Animation Data.h +++ b/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, diff --git a/Tactical/Interface Panels.cpp b/Tactical/Interface Panels.cpp index 61f8b44d..9fc6ac64 100644 --- a/Tactical/Interface Panels.cpp +++ b/Tactical/Interface Panels.cpp @@ -345,8 +345,7 @@ extern UINT32 guiCurrentItemDescriptionScreen; extern UINT32 guiCurrentItemDescriptionScreen; - -typedef enum +enum { STANCEUP_IMAGES = 0, UPDOWN_IMAGES, @@ -368,7 +367,7 @@ typedef enum NUM_SM_BUTTON_IMAGES }; -typedef enum +enum { ENDTURN_IMAGES = 0, ROSTERMODE_IMAGES, diff --git a/Tactical/Interface Panels.h b/Tactical/Interface Panels.h index e1d3676e..923eb108 100644 --- a/Tactical/Interface Panels.h +++ b/Tactical/Interface Panels.h @@ -1,8 +1,7 @@ #ifndef __INTERFACE_PANELS #define __INTERFACE_PANELS - -typedef enum +enum { STANCEUP_BUTTON = 0, UPDOWN_BUTTON, @@ -22,8 +21,7 @@ typedef enum NUM_SM_BUTTONS }; - -typedef enum +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 diff --git a/Tactical/Interface.cpp b/Tactical/Interface.cpp index 2bff0576..7641c0e8 100644 --- a/Tactical/Interface.cpp +++ b/Tactical/Interface.cpp @@ -198,7 +198,7 @@ extern BOOLEAN gfUserTurnRegionActive; extern UINT8 gubSelectSMPanelToMerc; extern BOOLEAN gfIgnoreOnSelectedGuy; -typedef enum +enum { WALK_IMAGES = 0, SNEAK_IMAGES, diff --git a/Tactical/Item Types.h b/Tactical/Item Types.h index 2e4be9af..fe26ba3e 100644 --- a/Tactical/Item Types.h +++ b/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 diff --git a/Tactical/Squads.cpp b/Tactical/Squads.cpp index bf462d6a..91c63302 100644 --- a/Tactical/Squads.cpp +++ b/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 ) diff --git a/TacticalAI/AIUtils.cpp b/TacticalAI/AIUtils.cpp index 0e5bbdc3..c3410eec 100644 --- a/TacticalAI/AIUtils.cpp +++ b/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 && diff --git a/TileEngine/renderworld.cpp b/TileEngine/renderworld.cpp index fb6433b2..dd1ce8b0 100644 --- a/TileEngine/renderworld.cpp +++ b/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,