mirror of
https://github.com/1dot13/source.git
synced 2026-08-05 14:00: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:
@@ -5326,7 +5326,7 @@ UINT8 FindNextMercInTeamPanel( SOLDIERTYPE *pSoldier, BOOLEAN fGoodForLessOKLife
|
||||
}
|
||||
|
||||
|
||||
if ( ( gusSelectedSoldier != NO_SOLDIER ) && ( gGameSettings.fOptions[ TOPTION_SPACE_SELECTS_NEXT_SQUAD ] ) )
|
||||
if ( ( gusSelectedSoldier != NOBODY ) && ( gGameSettings.fOptions[ TOPTION_SPACE_SELECTS_NEXT_SQUAD ] ) )
|
||||
{
|
||||
// only allow if nothing in hand and if in SM panel, the Change Squad button must be enabled
|
||||
if ( ( ( gsCurInterfacePanel != TEAM_PANEL ) || ( ButtonList[ iTEAMPanelButtons[ CHANGE_SQUAD_BUTTON ] ]->uiFlags & BUTTON_ENABLED ) ) )
|
||||
|
||||
Reference in New Issue
Block a user