From 0c8aa89f086b10ece3f1e710a6609faa863e6aa9 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Mon, 11 Jul 2011 10:39:47 +0000
Subject: [PATCH] - Bugfix: Disabled the experimental fix  from Headrocks HAM
 3.2, were enemies with 0 APs can enter the battle o This experimental fix
 caused assertion errors in AddPossiblePendingMilitiaToBattle()

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4564 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/TeamTurns.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Tactical/TeamTurns.cpp b/Tactical/TeamTurns.cpp
index 99b46fcb..28baf6cf 100644
--- a/Tactical/TeamTurns.cpp
+++ b/Tactical/TeamTurns.cpp
@@ -344,7 +344,10 @@ void EndTurn( UINT8 ubNextTeam )
 		gTacticalStatus.ubCurrentTeam	= ubNextTeam;
 
 		if(is_server || !is_client) BeginTeamTurn( gTacticalStatus.ubCurrentTeam );
+
+		// WANNE: Disabled Headrocks Experimental fix, because it causes assertion in AddPossiblePendingMilitiaToBattle();
 		// HEADROCK HAM 3.2: Experimental fix to force reinforcements enter battle with 0 APs.
+		/*
 		if (gGameExternalOptions.ubReinforcementsFirstTurnFreeze == 1 || gGameExternalOptions.ubReinforcementsFirstTurnFreeze == 2)
 		{
 			AddPossiblePendingEnemiesToBattle();
@@ -353,6 +356,7 @@ void EndTurn( UINT8 ubNextTeam )
 		{
 			AddPossiblePendingMilitiaToBattle();
 		}
+		*/
 
 		BetweenTurnsVisibilityAdjustments();
 	}