From 004fdf839b6e3fbd6a092f42153aad1bcda646a8 Mon Sep 17 00:00:00 2001 From: Flugente Date: Sat, 3 May 2014 00:17:08 +0000 Subject: [PATCH] Fix: when taking an enemy general prisoner, he was not always removed correctly git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7188 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Overhead.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp index 3c8fb5f4..c9d502e4 100644 --- a/Tactical/Overhead.cpp +++ b/Tactical/Overhead.cpp @@ -6715,12 +6715,6 @@ void RemoveCapturedEnemiesFromSectorInfo( INT16 sMapX, INT16 sMapY, INT8 bMapZ ) if ( pTeamSoldier->usSoldierFlagMask & SOLDIER_ENEMY_OFFICER ) { ++ubNumPrisonerOfficer; - - // Flugente: VIPs - if ( pTeamSoldier->usSoldierFlagMask & SOLDIER_VIP ) - { - DeleteVIP( pTeamSoldier->sSectorX, pTeamSoldier->sSectorY ); - } } else { @@ -6736,6 +6730,12 @@ void RemoveCapturedEnemiesFromSectorInfo( INT16 sMapX, INT16 sMapY, INT8 bMapZ ) } } + // Flugente: VIPs + if ( pTeamSoldier->usSoldierFlagMask & SOLDIER_VIP ) + { + DeleteVIP( pTeamSoldier->sSectorX, pTeamSoldier->sSectorY ); + } + // Flugente: campaign stats gCurrentIncident.AddStat( pTeamSoldier, CAMPAIGNHISTORY_TYPE_PRISONER );