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

2017-01-29 10:29:10 +08:00
parent e128d548f4 bb2ab1c1fe
commit 2c5f6d8332
22 changed files with 183 additions and 104 deletions
--- a/projects/mtg/src/MTGAbility.cpp
+++ b/projects/mtg/src/MTGAbility.cpp
@@ -5383,7 +5383,7 @@ int ActivatedAbility::isReactingToClick(MTGCardInstance * card, ManaCost * mana)
    case OPPONENT_TURN_ONLY:
        if (player == game->currentPlayer)
            return 0;
-            break;
+        break;
    case AS_SORCERY:
        if (player != game->currentPlayer)
            return 0;
@@ -5555,7 +5555,7 @@ int ActivatedAbility::activateAbility()
            ExtraCost * tapper = dynamic_cast<TapCost*>(cost->extraCosts->costs[i]);
            if(tapper)
                needsTapping = 1;
-                wasTappedForMana = true;
+            wasTappedForMana = true;
        }
    }
    else if(amp||femp)