diff --git a/projects/mtg/src/GameObserver.cpp b/projects/mtg/src/GameObserver.cpp index 2c1195dcd..32516e767 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(); } }