Fixed and activated redo in testsuite

projects/mtg/include/ActionStack.h

@@ -204,7 +204,6 @@ protected:
     JQuadPtr pspIcons[8];
     InterruptDecision interruptDecision[2];
     float timer;
-    int currentState;
     ActionStackMode mode;
     int checked;
     ATutorialMessage* currentTutorial;
@@ -224,7 +223,7 @@ public:
     int getNextIndex(Interruptible * previous, int type = 0, int state = 0 , int display = -1);
     void Fizzle(Interruptible * action, FizzleMode fizzleMode = PUT_IN_GRAVEARD);
     Interruptible * getAt(int id);
-    void cancelInterruptOffer(InterruptDecision cancelMode = DONT_INTERRUPT, bool log = true);
+    void cancelInterruptOffer(Player* p = 0, InterruptDecision cancelMode = DONT_INTERRUPT, bool log = true);
     void endOfInterruption(bool log = true);
     Interruptible * getLatest(int state);
     Player * askIfWishesToInterrupt;
@@ -251,7 +250,9 @@ public:
 #endif
     void setCurrentTutorial(ATutorialMessage* message) {currentTutorial = message;};
     ATutorialMessage* getCurrentTutorial() {return currentTutorial;};
-    bool isCalm() {return interruptDecision[0] == NOT_DECIDED && interruptDecision[1] == NOT_DECIDED;};
+    bool isNotUndecided() {
+        return (interruptDecision[0] == NOT_DECIDED && interruptDecision[1] == NOT_DECIDED);
+    };
 };
 
 #endif

projects/mtg/include/GameObserver.h

@@ -78,7 +78,7 @@ class GameObserver{
   vector<list<Phase*> >gameTurn;
   int cancelCurrentAction();
   ExtraCosts * mExtraPayment;
-  int oldGamePhase;
+  GamePhase oldGamePhase;
   TargetChooser * targetChooser;
   DuelLayers * mLayers;
   ReplacementEffects *replacementEffects;
@@ -139,6 +139,7 @@ class GameObserver{
   int receiveEvent(WEvent * event);
   bool connectRule;
 
+  void logActionMomir(MTGCardInstance * card_to_discard, int cardId);
   void logAction(Player* player, const string& s="");
   void logAction(int playerId, const string& s="") {
       logAction(players[playerId], s);