From 186093923cbf8fad575fe95a42fd4b25c47ca121 Mon Sep 17 00:00:00 2001 From: Flugente Date: Mon, 28 Mar 2016 21:31:21 +0000 Subject: [PATCH] Fix: reinforcements do not arrive when no other enemies are present and reinforcements are ordered to be delayed. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8130 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Tactical Turns.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Tactical/Tactical Turns.cpp b/Tactical/Tactical Turns.cpp index a037ec5ff..94e7a63a7 100644 --- a/Tactical/Tactical Turns.cpp +++ b/Tactical/Tactical Turns.cpp @@ -178,7 +178,12 @@ void HandleTacticalEndTurn( ) if(gGameExternalOptions.gfAllowReinforcements)//dnl ch68 100913 { - ((gTacticalStatus.Team[ENEMY_TEAM].bTeamActive || gTacticalStatus.Team[MILITIA_TEAM].bTeamActive) ? (guiTurnCnt++) : (guiTurnCnt = 0)); + if ( gTacticalStatus.Team[ENEMY_TEAM].bTeamActive || gfPendingNonPlayerTeam[ENEMY_TEAM] || + gTacticalStatus.Team[MILITIA_TEAM].bTeamActive || gfPendingNonPlayerTeam[MILITIA_TEAM] ) + ++guiTurnCnt; + else + guiTurnCnt = 0; + //Check for enemy pooling (add enemies if there happens to be more than the max in the //current battle. If one or more slots have freed up, we can add them now. AddPossiblePendingEnemiesToBattle();