1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- somehow lost two condition in previous commit, correct what is missing.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6387 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Kriplo
2013-09-10 21:02:53 +00:00
parent f5ac5be03f
commit d760d34d7e
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Tactical Turns.cpp
+8 -6
View File
@@ -175,12 +175,14 @@ void HandleTacticalEndTurn( )
// decay AI warning values from corpses
DecayRottingCorpseAIWarnings();
((gTacticalStatus.Team[ENEMY_TEAM].bTeamActive || gTacticalStatus.Team[MILITIA_TEAM].bTeamActive) ? (guiTurnCnt++) : (guiTurnCnt = 0));//dnl ch68 090913
//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();
AddPossiblePendingMilitiaToBattle();
if(gGameExternalOptions.gfAllowReinforcements)//dnl ch68 100913
{
((gTacticalStatus.Team[ENEMY_TEAM].bTeamActive || gTacticalStatus.Team[MILITIA_TEAM].bTeamActive) ? (guiTurnCnt++) : (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();
AddPossiblePendingMilitiaToBattle();
}
// Loop through each active team and decay public opplist...
// May want this done every few times too
Tactical/TeamTurns.cpp
+7 -10
View File
@@ -325,18 +325,15 @@ void EndTurn( UINT8 ubNextTeam )
}
else
{
guiTurnCnt++;//dnl ch68 080913
// Flugente: I'm not really sure why we check here for gGameExternalOptions.ubReinforcementsFirstTurnFreeze, shouldn't that be a check for ALLOW_REINFORCEMENTS?
// as this inhibits reinforcements during turnbased-mode, I'll check for that instead
// HEADROCK HAM 3.2: Experimental fix to force reinforcements enter battle with 0 APs.
//if (gGameExternalOptions.ubReinforcementsFirstTurnFreeze != 1 && gGameExternalOptions.ubReinforcementsFirstTurnFreeze != 2)
if ( gGameExternalOptions.gfAllowReinforcements )
if(gGameExternalOptions.gfAllowReinforcements)//dnl ch68 100913 agree with Flugente, put all under one condition
{
guiTurnCnt++;
// Flugente: I'm not really sure why we check here for gGameExternalOptions.ubReinforcementsFirstTurnFreeze, shouldn't that be a check for ALLOW_REINFORCEMENTS?
// as this inhibits reinforcements during turnbased-mode, I'll check for that instead
// HEADROCK HAM 3.2: Experimental fix to force reinforcements enter battle with 0 APs.
//if (gGameExternalOptions.ubReinforcementsFirstTurnFreeze != 1 && gGameExternalOptions.ubReinforcementsFirstTurnFreeze != 2)
AddPossiblePendingEnemiesToBattle();
}
//if (gGameExternalOptions.ubReinforcementsFirstTurnFreeze != 1 && gGameExternalOptions.ubReinforcementsFirstTurnFreeze != 3)
if ( gGameExternalOptions.gfAllowReinforcements )
{
//if (gGameExternalOptions.ubReinforcementsFirstTurnFreeze != 1 && gGameExternalOptions.ubReinforcementsFirstTurnFreeze != 3)
AddPossiblePendingMilitiaToBattle();
}