From b41653aeea0a5bffa476e8a3557f596b47b4093f Mon Sep 17 00:00:00 2001 From: Flugente Date: Sun, 3 Mar 2013 00:15:08 +0000 Subject: [PATCH] Fix: capturing soldiers who were members of reinforcement groups led to incorrect group size git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5889 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Overhead.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp index 40e40198..8c01d40d 100644 --- a/Tactical/Overhead.cpp +++ b/Tactical/Overhead.cpp @@ -6855,6 +6855,9 @@ void RemoveCapturedEnemiesFromSectorInfo( INT16 sMapX, INT16 sMapY, INT8 bMapZ ) else pTeamSoldier->RemoveSoldierFromGridNo( ); + // this function updates number of enemies, and also updates groups + ProcessQueenCmdImplicationsOfDeath( pTeamSoldier ); + // Remove as target RemoveManAsTarget( pTeamSoldier ); } @@ -6867,28 +6870,12 @@ void RemoveCapturedEnemiesFromSectorInfo( INT16 sMapX, INT16 sMapY, INT8 bMapZ ) SECTORINFO *pSectorInfo = &( SectorInfo[ SECTOR( sMapX, sMapY ) ] ); pSectorInfo->uiNumberOfPrisonersOfWar += ubNumPrisoners; - - pSectorInfo->ubNumAdmins -= ubNumPrisonerAdmin; - pSectorInfo->ubNumTroops -= ubNumPrisonerTroop; - pSectorInfo->ubNumElites -= ubNumPrisonerElite; - - pSectorInfo->ubAdminsInBattle -= ubNumPrisonerAdmin; - pSectorInfo->ubTroopsInBattle -= ubNumPrisonerTroop; - pSectorInfo->ubElitesInBattle -= ubNumPrisonerElite; } else { UNDERGROUND_SECTORINFO *pSectorInfo = FindUnderGroundSector( sMapX, sMapY, bMapZ ); pSectorInfo->uiNumberOfPrisonersOfWar += ubNumPrisoners; - - pSectorInfo->ubNumAdmins -= ubNumPrisonerAdmin; - pSectorInfo->ubNumTroops -= ubNumPrisonerTroop; - pSectorInfo->ubNumElites -= ubNumPrisonerElite; - - pSectorInfo->ubAdminsInBattle -= ubNumPrisonerAdmin; - pSectorInfo->ubTroopsInBattle -= ubNumPrisonerTroop; - pSectorInfo->ubElitesInBattle -= ubNumPrisonerElite; } if ( ubNumPrisoners )