Fix: compiler warnings

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8471 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-09-13 20:01:48 +00:00
parent b6dde6a0da
commit 2fe522db4b
10 changed files with 22 additions and 32 deletions
+2 -2
View File
@@ -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,
+2 -3
View File
@@ -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,
+2 -5
View File
@@ -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
+1 -1
View File
@@ -198,7 +198,7 @@ extern BOOLEAN gfUserTurnRegionActive;
extern UINT8 gubSelectSMPanelToMerc;
extern BOOLEAN gfIgnoreOnSelectedGuy;
typedef enum
enum
{
WALK_IMAGES = 0,
SNEAK_IMAGES,
+5 -4
View File
@@ -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
+1 -3
View File
@@ -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 )