- replaced NO_SOLDIER with NOBODY

- replaced NO_MAP_POS with NOWHERE

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1252 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2007-08-22 14:54:41 +00:00
parent f035858e3f
commit 85152e7a05
24 changed files with 69 additions and 68 deletions
+2 -2
View File
@@ -386,7 +386,7 @@ void LoadSchedules( INT8 **hBuffer )
pSchedule = gpScheduleList;
}
pSchedule->ubScheduleID = gubScheduleID;
pSchedule->ubSoldierID = NO_SOLDIER;
pSchedule->ubSoldierID = NOBODY;
pSchedule->next = NULL;
gubScheduleID++;
ubNum--;
@@ -446,7 +446,7 @@ BOOLEAN LoadSchedulesFromSave( HWFILE hFile )
// should be unnecessary here, then we can toast reconnect schedule
/*
pSchedule->ubScheduleID = gubScheduleID;
pSchedule->ubSoldierID = NO_SOLDIER;
pSchedule->ubSoldierID = NOBODY;
*/
pSchedule->next = NULL;
+2 -2
View File
@@ -10,8 +10,8 @@
#define MAX_TOWN_NAME_LENGHT 32
#define MAX_TOWNS 50 //13
#define MAX_TOWN_SECTORS 260 //40
#define MAX_TOWNS 50 //13 //50
#define MAX_TOWN_SECTORS 260 //40 //260
// Sector name identifiers
enum Towns
+1 -1
View File
@@ -2474,7 +2474,7 @@ void UpdateMercsInSector( INT16 sSectorX, INT16 sSectorY, INT8 bSectorZ )
if( !(gTacticalStatus.uiFlags & LOADING_SAVED_GAME ) )
{
//DONT set these values
gusSelectedSoldier = NO_SOLDIER;
gusSelectedSoldier = NOBODY;
gfGameScreenLocateToSoldier = TRUE;
}
+1 -1
View File
@@ -30,7 +30,7 @@ extern INT8 gbWorldSectorZ;
// SAM definitions
extern UINT8 NUMBER_OF_SAMS;
#define MAX_NUMBER_OF_SAMS 50 //4
#define MAX_NUMBER_OF_SAMS 50 //4 //50
extern INT16 pSamList[ MAX_NUMBER_OF_SAMS ];
extern INT16 pSamGridNoAList[ MAX_NUMBER_OF_SAMS ];