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

reverted the change i made, found specail cases where this cause bugs.

Browse Source
This commit is contained in:
omegablast2002@yahoo.com
2010-11-24 14:40:06 +00:00
parent d1577ef35e
commit 2aa47cd68b
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/mtg/src/GameObserver.cpp
View File

@@ -81,7 +81,7 @@ void GameObserver::nextGamePhase()
} }
if (cPhaseOld->id == Constants::MTG_PHASE_COMBATBLOCKERS) if (cPhaseOld->id == Constants::MTG_PHASE_COMBATBLOCKERS)
if (BLOCKERS == combatStep) if (BLOCKERS == combatStep || TRIGGERS == combatStep)
{ {
nextCombatStep(); nextCombatStep();
return; return;

1
projects/mtg/src/GuiCombat.cpp
View File

@@ -168,6 +168,7 @@ bool GuiCombat::clickOK()
{ {
case BLOCKERS: case BLOCKERS:
case TRIGGERS: 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 return false; // that should not happen
case ORDER: case ORDER: