1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-19 14:20:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

changed hardcoded numbers to enums in preparation for total merc number increase

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6042 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-04-30 21:31:04 +00:00
parent 82dec9404c
commit 2455c2c467
11 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Faces.cpp
+1 -1
View File
@@ -65,7 +65,7 @@ extern BOOLEAN gfInItemPickupMenu;
RPC_SMALL_FACE_VALUES gRPCSmallFaceValues[200];
UINT8 ubRPCNumSmallFaceValues = 200;
CAMO_FACE gCamoFace[255];
CAMO_FACE gCamoFace[NUM_PROFILES];
FACE_GEAR_VALUES zNewFaceGear[MAXITEMS];
FACE_GEAR_VALUES zNewFaceGearIMP[MAXITEMS];
Tactical/Soldier Create.cpp
+4 -4
View File
@@ -1151,11 +1151,11 @@ SOLDIERTYPE* TacticalCreateSoldier( SOLDIERCREATE_STRUCT *pCreateStruct, UINT8 *
pSoldier = new SOLDIERTYPE(Soldier); //(SOLDIERTYPE*)MemAlloc( SIZEOF_SOLDIERTYPE );
if( !pSoldier )
return NULL;
pSoldier->ubID = 255;
pSoldier->ubID = NUM_PROFILES;
pSoldier->sSectorX = (INT16)SECTORX( ubSectorID );
pSoldier->sSectorY = (INT16)SECTORY( ubSectorID );
pSoldier->bSectorZ = 0;
*pubID = 255;
*pubID = NUM_PROFILES;
return pSoldier;
}
}
@@ -2790,7 +2790,7 @@ SOLDIERTYPE* ReserveTacticalSoldierForAutoresolve( UINT8 ubSoldierClass )
return NULL;
//Assign a bogus ID, then return it
pSoldier->ubID = 255;
pSoldier->ubID = NUM_PROFILES;
return pSoldier;
}
}
@@ -2971,7 +2971,7 @@ SOLDIERTYPE* ReserveTacticalMilitiaSoldierForAutoresolve( UINT8 ubSoldierClass )
MercPtrs[i]->bSoldierFlagMask |= SOLDIER_EQUIPMENT_DROPPED;
//Assign a bogus ID, then return it
pSoldier->ubID = 255;
pSoldier->ubID = NUM_PROFILES;
return pSoldier;
}
}
Tactical/faces.h
+2 -1
View File
@@ -6,6 +6,7 @@
#define SURPRISED 3
#include "soldier control.h"
#include "soldier profile type.h"
// Defines
#define NUM_FACE_SLOTS 50
@@ -25,7 +26,7 @@ typedef struct
BOOLEAN gSnowCamoface;
} CAMO_FACE;
extern CAMO_FACE gCamoFace[255];
extern CAMO_FACE gCamoFace[NUM_PROFILES];
typedef struct