diff --git a/projects/mtg/src/GameObserver.cpp b/projects/mtg/src/GameObserver.cpp index 6672c5ea1..bb4c2f06a 100644 --- a/projects/mtg/src/GameObserver.cpp +++ b/projects/mtg/src/GameObserver.cpp @@ -81,7 +81,7 @@ void GameObserver::nextGamePhase() } if (cPhaseOld->id == Constants::MTG_PHASE_COMBATBLOCKERS) - if (BLOCKERS == combatStep) + if (BLOCKERS == combatStep || TRIGGERS == combatStep) { nextCombatStep(); return; diff --git a/projects/mtg/src/GuiCombat.cpp b/projects/mtg/src/GuiCombat.cpp index 3082c4491..2e2b9c7bc 100644 --- a/projects/mtg/src/GuiCombat.cpp +++ b/projects/mtg/src/GuiCombat.cpp @@ -168,6 +168,7 @@ bool GuiCombat::clickOK() { case BLOCKERS: case TRIGGERS: + assert(false);//this is an assert for "do i show the screen that lets you select multiple blocker damage assignment. return false; // that should not happen case ORDER: