From 1fe35da5b3432fcacdd380096af454150f541c4f Mon Sep 17 00:00:00 2001 From: "omegablast2002@yahoo.com" Date: Thu, 9 Dec 2010 18:34:23 +0000 Subject: [PATCH] forgot to change back one line i changed, this is part of the manual revert i did earlier. --- projects/mtg/src/GameObserver.cpp | 36 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/projects/mtg/src/GameObserver.cpp b/projects/mtg/src/GameObserver.cpp index 28598b0ce..2c1195dcd 100644 --- a/projects/mtg/src/GameObserver.cpp +++ b/projects/mtg/src/GameObserver.cpp @@ -210,23 +210,23 @@ void GameObserver::userRequestNextGamePhase() return; bool executeNextPhaseImmediately = true; - - Phase * cPhaseOld = phaseRing->getCurrentPhase(); - if ((cPhaseOld->id == Constants::MTG_PHASE_COMBATBLOCKERS && combatStep == ORDER) || (cPhaseOld->id - == Constants::MTG_PHASE_COMBATBLOCKERS && combatStep == TRIGGERS) || cPhaseOld->id - == Constants::MTG_PHASE_COMBATDAMAGE || opponent()->isAI() - || options[Options::optionInterrupt(currentGamePhase)].number) - { - executeNextPhaseImmediately = false; - } - - if (executeNextPhaseImmediately) - { - nextGamePhase(); - } - else - { - mLayers->stackLayer()->AddNextGamePhase(); + + Phase * cPhaseOld = phaseRing->getCurrentPhase(); + if ((cPhaseOld->id == Constants::MTG_PHASE_COMBATBLOCKERS && combatStep == ORDER) || (cPhaseOld->id + == Constants::MTG_PHASE_COMBATBLOCKERS && combatStep == TRIGGERS) || cPhaseOld->id + == Constants::MTG_PHASE_COMBATDAMAGE || opponent()->isAI() + || options[Options::optionInterrupt(currentGamePhase)].number) + { + executeNextPhaseImmediately = false; + } + + if (executeNextPhaseImmediately) + { + nextGamePhase(); + } + else + { + mLayers->stackLayer()->AddNextGamePhase(); } } @@ -427,7 +427,7 @@ void GameObserver::stateEffects() if (combatStep == TRIGGERS) { if (!mLayers->stackLayer()->getNext(NULL, 0, NOT_RESOLVED) && !targetChooser && !mLayers->actionLayer()->isWaitingForAnswer()) - userRequestNextGamePhase(); + mLayers->stackLayer()->AddNextCombatStep(); } //Auto skip Phases