Merge branch 'valgrind' of https://github.com/ZobyTwo/wagic into ZobyTwo-valgrind

2013-11-29 19:41:46 +01:00
parent 965d4f6d45 0db2925e7a
commit bedd1e8da8
11 changed files with 23 additions and 7 deletions
--- a/projects/mtg/include/AllAbilities.h
+++ b/projects/mtg/include/AllAbilities.h
@@ -1258,6 +1258,7 @@ public:

    GenericActivatedAbility(GameObserver* observer, string newName,string castRestriction,int _id, MTGCardInstance * card, MTGAbility * a, ManaCost * _cost, string limit = "",MTGAbility * sideEffects = NULL,string usesBeforeSideEffects = "",
            int restrictions = 0, MTGGameZone * dest = NULL);
+    GenericActivatedAbility(const GenericActivatedAbility& other);
    int resolve();
    const string getMenuText();
    int isReactingToClick(MTGCardInstance * card, ManaCost * mana = NULL);