Merge remote-tracking branch 'refs/remotes/WagicProject/master'

2016-07-27 12:41:38 +08:00
parent 014ca36a4a 7d460e093c
commit dd5d5589ff
1 changed files with 12 additions and 0 deletions
--- a/projects/mtg/src/AllAbilities.cpp
+++ b/projects/mtg/src/AllAbilities.cpp
@@ -773,6 +773,18 @@ bool MTGScryCards::CheckUserInput(JButton key)
                initDisplay(revealTopAmount);
                abilitySecond = contructAbility(abilityTwo);
                game->addObserver(abilitySecond);
+                if(revealTopAmount == 0 && dontRevealAfter && delayed)
+                    {
+                        MTGAbility * delayedA = contructAbility(delayedAbilityString);
+                        if (delayedA->oneShot)
+                        {
+                            delayedA->resolve();
+                            SAFE_DELETE(delayedA);
+                        }
+                        else
+                            delayedA->addToGame();
+
+                    }
            }

        }