in this commit suspend now states the amount of turns in the menutext....

made changes to some of the simple menu items, made the simple menu not draw massive horizontal and vertical poles, that look was extremely dated.

projects/mtg/include/MTGRules.h

@@ -66,7 +66,6 @@ public:
     MTGEventBonus(GameObserver* observer, int _id);
     virtual MTGEventBonus * clone() const;
 };
-
 class MTGPutInPlayRule: public PermanentAbility
 {
 public:
@@ -182,15 +181,7 @@ public:
     string suspendmenu;
     virtual ostream& toString(ostream& out) const;
     MTGSuspendRule(GameObserver* observer, int _id);
-    const char * getMenuText()
-    {
-        suspendmenu = "suspend";
-        //char buffer[20];
-        //sprintf(buffer,"-%i",card->suspendedTime);
-        //suspendmenu.append(buffer);
-        //TODO:make this work so it shows "Suspend-the amount of turns"
-        return suspendmenu.c_str();
-    }
+    const char * getMenuText();
     virtual MTGSuspendRule * clone() const;
 };
 

projects/mtg/include/Player.h

@@ -39,6 +39,8 @@ public:
     string deckName;
     string phaseRing;
     int offerInterruptOnPhase;
+    int skippingTurn;
+    int extraTurn;
     Player(GameObserver *observer, string deckFile, string deckFileSmall, MTGDeck * deck = NULL);
     virtual ~Player();
     virtual void setObserver(GameObserver*g);

projects/mtg/include/WEvent.h

@@ -76,6 +76,12 @@ struct WEventDamageStackResolved : public WEvent {
   WEventDamageStackResolved();
 };
 
+struct WEventPhasePreChange : public WEvent {
+  Phase * from;
+  Phase * to;
+  bool eventChanged;
+  WEventPhasePreChange(Phase * from,Phase * to);
+};
 struct WEventPhaseChange : public WEvent {
   Phase * from;
   Phase * to;