mirror of
https://github.com/1dot13/source.git
synced 2026-07-29 13:52:17 +02:00
- 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:
@@ -3158,11 +3158,11 @@ BOOLEAN LoadWorld( const STR8 puiFilename )
|
||||
gfForceLoad = FALSE;
|
||||
|
||||
// CHECK IF OUR SELECTED GUY IS GONE!
|
||||
if ( gusSelectedSoldier != NO_SOLDIER )
|
||||
if ( gusSelectedSoldier != NOBODY )
|
||||
{
|
||||
if ( MercPtrs[ gusSelectedSoldier ]->bActive == FALSE )
|
||||
{
|
||||
gusSelectedSoldier = NO_SOLDIER;
|
||||
gusSelectedSoldier = NOBODY;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3219,7 +3219,7 @@ BOOLEAN NewWorld( void )
|
||||
UINT16 NewIndex;
|
||||
INT32 cnt;
|
||||
|
||||
gusSelectedSoldier = gusOldSelectedSoldier = NO_SOLDIER;
|
||||
gusSelectedSoldier = gusOldSelectedSoldier = NOBODY;
|
||||
|
||||
AdjustSoldierCreationStartValues( );
|
||||
|
||||
|
||||
Reference in New Issue
Block a user