Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

forgot to change back one line i changed, this is part of the manual revert i did earlier.

Browse Source
This commit is contained in:
omegablast2002@yahoo.com
2010-12-09 18:34:23 +00:00
parent 5d0029a2eb
commit 1fe35da5b3
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/GameObserver.cpp
+18 -18
View File
@@ -210,23 +210,23 @@ void GameObserver::userRequestNextGamePhase()
return; return;
bool executeNextPhaseImmediately = true; bool executeNextPhaseImmediately = true;
Phase * cPhaseOld = phaseRing->getCurrentPhase(); Phase * cPhaseOld = phaseRing->getCurrentPhase();
if ((cPhaseOld->id == Constants::MTG_PHASE_COMBATBLOCKERS && combatStep == ORDER) || (cPhaseOld->id if ((cPhaseOld->id == Constants::MTG_PHASE_COMBATBLOCKERS && combatStep == ORDER) || (cPhaseOld->id
== Constants::MTG_PHASE_COMBATBLOCKERS && combatStep == TRIGGERS) || cPhaseOld->id == Constants::MTG_PHASE_COMBATBLOCKERS && combatStep == TRIGGERS) || cPhaseOld->id
== Constants::MTG_PHASE_COMBATDAMAGE || opponent()->isAI() == Constants::MTG_PHASE_COMBATDAMAGE || opponent()->isAI()
|| options[Options::optionInterrupt(currentGamePhase)].number) || options[Options::optionInterrupt(currentGamePhase)].number)
{ {
executeNextPhaseImmediately = false; executeNextPhaseImmediately = false;
} }
if (executeNextPhaseImmediately) if (executeNextPhaseImmediately)
{ {
nextGamePhase(); nextGamePhase();
} }
else else
{ {
mLayers->stackLayer()->AddNextGamePhase(); mLayers->stackLayer()->AddNextGamePhase();
} }
} }
@@ -427,7 +427,7 @@ void GameObserver::stateEffects()
if (combatStep == TRIGGERS) if (combatStep == TRIGGERS)
{ {
if (!mLayers->stackLayer()->getNext(NULL, 0, NOT_RESOLVED) && !targetChooser && !mLayers->actionLayer()->isWaitingForAnswer()) if (!mLayers->stackLayer()->getNext(NULL, 0, NOT_RESOLVED) && !targetChooser && !mLayers->actionLayer()->isWaitingForAnswer())
userRequestNextGamePhase(); mLayers->stackLayer()->AddNextCombatStep();
} }
//Auto skip Phases //Auto skip Phases