From d1577ef35e464646d431abbc6920fd6f71e84b5f Mon Sep 17 00:00:00 2001 From: "omegablast2002@yahoo.com" Date: Wed, 24 Nov 2010 13:46:27 +0000 Subject: [PATCH] corrected an issue where the player was being offered interupt 2 times for "combat damage" not closing the ticket until i can get some help verifying that it covers all cases where it might be true. --- projects/mtg/src/GameObserver.cpp | 2 +- projects/mtg/src/GuiCombat.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/mtg/src/GameObserver.cpp b/projects/mtg/src/GameObserver.cpp index bb4c2f06a..6672c5ea1 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 || TRIGGERS == combatStep) + if (BLOCKERS == combatStep) { nextCombatStep(); return; diff --git a/projects/mtg/src/GuiCombat.cpp b/projects/mtg/src/GuiCombat.cpp index 6816620e1..3082c4491 100644 --- a/projects/mtg/src/GuiCombat.cpp +++ b/projects/mtg/src/GuiCombat.cpp @@ -168,7 +168,6 @@ bool GuiCombat::clickOK() { case BLOCKERS: case TRIGGERS: - assert(false); return false; // that should not happen case ORDER: