Merge pull request #13 from WagicProject/master

getting master
2016-07-08 17:54:14 -04:00
parent c0c52e57df dff938e802
commit 242c7b623f
8 changed files with 331 additions and 332 deletions
@@ -113,6 +113,7 @@ public:
    bool isDualWielding;
    bool stillNeeded;
    Player * lastController;
+    Player * previousController;
    MTGGameZone * getCurrentZone();
    MTGGameZone * previousZone;
    MTGCardInstance * previous;