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

- Bugfix: Disabled the experimental fix from Headrocks HAM 3.2, were enemies with 0 APs can enter the battle

Browse Source 
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
This commit is contained in:
Wanne
2011-07-11 10:39:47 +00:00
parent 02f7f2037c
commit 0c8aa89f08
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/TeamTurns.cpp
+4
View File
@@ -344,7 +344,10 @@ void EndTurn( UINT8 ubNextTeam )
gTacticalStatus.ubCurrentTeam = ubNextTeam; gTacticalStatus.ubCurrentTeam = ubNextTeam;
if(is_server || !is_client) BeginTeamTurn( gTacticalStatus.ubCurrentTeam ); 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. // HEADROCK HAM 3.2: Experimental fix to force reinforcements enter battle with 0 APs.
/*
if (gGameExternalOptions.ubReinforcementsFirstTurnFreeze == 1 || gGameExternalOptions.ubReinforcementsFirstTurnFreeze == 2) if (gGameExternalOptions.ubReinforcementsFirstTurnFreeze == 1 || gGameExternalOptions.ubReinforcementsFirstTurnFreeze == 2)
{ {
AddPossiblePendingEnemiesToBattle(); AddPossiblePendingEnemiesToBattle();
@@ -353,6 +356,7 @@ void EndTurn( UINT8 ubNextTeam )
{ {
AddPossiblePendingMilitiaToBattle(); AddPossiblePendingMilitiaToBattle();
} }
*/
BetweenTurnsVisibilityAdjustments(); BetweenTurnsVisibilityAdjustments();
} }