reverted my changes in rev 2774 which intruduced bugs, coincidently stumbled across what really fixed triggers substep, which was moving it into stateeffects...this revert reintruduces the double interrupt offer to combatdamage in some specail cases.

2010-12-09 13:31:09 +00:00
parent b595091855
commit 5d96f68d21
2 changed files with 21 additions and 48 deletions
--- a/projects/mtg/src/GuiCombat.cpp
+++ b/projects/mtg/src/GuiCombat.cpp
@@ -648,7 +648,7 @@ int GuiCombat::receiveEventMinus(WEvent* e)
                cursor_pos = ATK;
            }
            else
-							go->userRequestNextGamePhase();
+							go->nextCombatStep();
            return 1;
        case END_DAMAGE:
            step = END_DAMAGE;