1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: capturing soldiers who were members of reinforcement groups led to incorrect group size

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5889 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-03-03 00:15:08 +00:00
parent 72dbd9e33f
commit b41653aeea
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Overhead.cpp
+3 -16
View File
@@ -6855,6 +6855,9 @@ void RemoveCapturedEnemiesFromSectorInfo( INT16 sMapX, INT16 sMapY, INT8 bMapZ )
else else
pTeamSoldier->RemoveSoldierFromGridNo( ); pTeamSoldier->RemoveSoldierFromGridNo( );
// this function updates number of enemies, and also updates groups
ProcessQueenCmdImplicationsOfDeath( pTeamSoldier );
// Remove as target // Remove as target
RemoveManAsTarget( pTeamSoldier ); RemoveManAsTarget( pTeamSoldier );
} }
@@ -6867,28 +6870,12 @@ void RemoveCapturedEnemiesFromSectorInfo( INT16 sMapX, INT16 sMapY, INT8 bMapZ )
SECTORINFO *pSectorInfo = &( SectorInfo[ SECTOR( sMapX, sMapY ) ] ); SECTORINFO *pSectorInfo = &( SectorInfo[ SECTOR( sMapX, sMapY ) ] );
pSectorInfo->uiNumberOfPrisonersOfWar += ubNumPrisoners; pSectorInfo->uiNumberOfPrisonersOfWar += ubNumPrisoners;
pSectorInfo->ubNumAdmins -= ubNumPrisonerAdmin;
pSectorInfo->ubNumTroops -= ubNumPrisonerTroop;
pSectorInfo->ubNumElites -= ubNumPrisonerElite;
pSectorInfo->ubAdminsInBattle -= ubNumPrisonerAdmin;
pSectorInfo->ubTroopsInBattle -= ubNumPrisonerTroop;
pSectorInfo->ubElitesInBattle -= ubNumPrisonerElite;
} }
else else
{ {
UNDERGROUND_SECTORINFO *pSectorInfo = FindUnderGroundSector( sMapX, sMapY, bMapZ ); UNDERGROUND_SECTORINFO *pSectorInfo = FindUnderGroundSector( sMapX, sMapY, bMapZ );
pSectorInfo->uiNumberOfPrisonersOfWar += ubNumPrisoners; pSectorInfo->uiNumberOfPrisonersOfWar += ubNumPrisoners;
pSectorInfo->ubNumAdmins -= ubNumPrisonerAdmin;
pSectorInfo->ubNumTroops -= ubNumPrisonerTroop;
pSectorInfo->ubNumElites -= ubNumPrisonerElite;
pSectorInfo->ubAdminsInBattle -= ubNumPrisonerAdmin;
pSectorInfo->ubTroopsInBattle -= ubNumPrisonerTroop;
pSectorInfo->ubElitesInBattle -= ubNumPrisonerElite;
} }
if ( ubNumPrisoners ) if ( ubNumPrisoners )