mirror of
https://github.com/1dot13/source.git
synced 2026-08-12 14:10:23 +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:
@@ -195,7 +195,7 @@ void StartPlayerTeamTurn( BOOLEAN fDoBattleSnd, BOOLEAN fEnteringCombatMode )
|
||||
// Are we in combat already?
|
||||
if ( gTacticalStatus.uiFlags & INCOMBAT )
|
||||
{
|
||||
if ( gusSelectedSoldier != NO_SOLDIER )
|
||||
if ( gusSelectedSoldier != NOBODY )
|
||||
{
|
||||
// Check if this guy is able to be selected....
|
||||
if ( MercPtrs[ gusSelectedSoldier ]->bLife < OKLIFE )
|
||||
@@ -209,7 +209,7 @@ void StartPlayerTeamTurn( BOOLEAN fDoBattleSnd, BOOLEAN fEnteringCombatMode )
|
||||
}
|
||||
|
||||
// Slide to selected guy...
|
||||
if ( gusSelectedSoldier != NO_SOLDIER )
|
||||
if ( gusSelectedSoldier != NOBODY )
|
||||
{
|
||||
SlideTo( NOWHERE, gusSelectedSoldier, NOBODY ,SETLOCATOR);
|
||||
|
||||
@@ -1018,7 +1018,7 @@ void EndInterrupt( BOOLEAN fMarkInterruptOccurred )
|
||||
guiPendingOverrideEvent = LU_ENDUILOCK;
|
||||
HandleTacticalUI( );
|
||||
|
||||
if ( gusSelectedSoldier != NO_SOLDIER )
|
||||
if ( gusSelectedSoldier != NOBODY )
|
||||
{
|
||||
SlideTo( NOWHERE, gusSelectedSoldier, NOBODY ,SETLOCATOR);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user