From a59d799e03c2724d4d0b5b950c3a17d1993c0d17 Mon Sep 17 00:00:00 2001 From: Flugente Date: Sun, 22 Jul 2018 15:40:35 +0000 Subject: [PATCH] Change: Suppression now works in realtime outside of combat git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8584 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Overhead.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp index 57deb7527..ec5e42611 100644 --- a/Tactical/Overhead.cpp +++ b/Tactical/Overhead.cpp @@ -9237,9 +9237,9 @@ SOLDIERTYPE *InternalReduceAttackBusyCount( ) pTarget = MercPtrs[ pSoldier->ubTargetID ]; } - if ((gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT)) + // Flugente 18-07-22: commenting this out - it doesn't do harm in realtime, and is more realistic + //if ((gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT)) { - // Check to see if anyone was suppressed if (pTarget) { @@ -9249,8 +9249,7 @@ SOLDIERTYPE *InternalReduceAttackBusyCount( ) { HandleSuppressionFire( NOBODY, ubID ); } - - + //HandleAfterShootingGuy( pSoldier, pTarget ); // suppression fire might cause the count to be increased, so check it again