From 2d1436aa5dc655cfc3e5de520715d8c588483db5 Mon Sep 17 00:00:00 2001 From: Flugente Date: Fri, 2 May 2014 23:30:11 +0000 Subject: [PATCH] Generals no longer become officers, as that would make it easier to identify them. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7187 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Interface.cpp | 5 +++-- Tactical/Soldier Create.cpp | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Tactical/Interface.cpp b/Tactical/Interface.cpp index 088c3dc1..d3de1c08 100644 --- a/Tactical/Interface.cpp +++ b/Tactical/Interface.cpp @@ -6595,8 +6595,9 @@ BOOLEAN ShowSoldierRoleSymbol(SOLDIERTYPE* pSoldier) sYPos += 20; } } - // is this guy an (non-vip) officer? - else if ( pSoldier->usSoldierFlagMask & SOLDIER_ENEMY_OFFICER ) + + // is this guy an officer? + if ( pSoldier->usSoldierFlagMask & SOLDIER_ENEMY_OFFICER ) { // Add bars iBack = RegisterBackgroundRect( BGND_FLAG_SINGLE, NULL, sXPos, sYPos, (INT16)(sXPos + 20 ), (INT16)(sYPos + 20 ) ); diff --git a/Tactical/Soldier Create.cpp b/Tactical/Soldier Create.cpp index 75a73cf7..24577a61 100644 --- a/Tactical/Soldier Create.cpp +++ b/Tactical/Soldier Create.cpp @@ -1738,8 +1738,7 @@ BOOLEAN TacticalCopySoldierFromCreateStruct( SOLDIERTYPE *pSoldier, SOLDIERCREAT if ( !NumSoldiersWithFlagInSector( ENEMY_TEAM, SOLDIER_VIP ) && !NumSoldiersWithFlagInSector( CIV_TEAM, SOLDIER_VIP ) && (gWorldSectorX != gMercProfiles[GENERAL].sSectorX || gWorldSectorY != gMercProfiles[GENERAL].sSectorY) ) { // nope, so this guy will become the VIP - // generals are also officers... - pSoldier->usSoldierFlagMask |= (SOLDIER_ENEMY_OFFICER | SOLDIER_VIP); + pSoldier->usSoldierFlagMask |= SOLDIER_VIP; } // a VIP has bodyguards else if ( NumSoldiersWithFlagInSector( ENEMY_TEAM, SOLDIER_BODYGUARD ) < gGameExternalOptions.usEnemyGeneralsBodyGuardsNumber )