I just played 3 long games and I was able to undo two fully and got an assert on the third one after more than 1000 actions... so I commit what I have:

- Modified undo to stop at "next phase" action - Added "muligan" and "force library shuffling" to the list of logged action - Fixed random logging - Fixed double logging of actions - Merged all the "next game" functions into a single one - Created a PlayerType type instead of using int - Moved the player loading code into the GameObserver and out of GameStateDuel to avoid having player references in both and simplify the initialization and termination. Tweeked a bit the humanplayer class to be able to do that. - Added a "load" menu available in testsuite mode, I use that to load problematique game. To use it, just copy-paste a game from the traces into Res/test/game/timetwister.txt. Game in traces starts by "rvalues:..." and ends by "[end]" - Added some untested and commented out code in GuiCombat to use the mouse/touch to setup the damage on the blockers - Broke the network game ... hoh well, I'll repair it when everything else works !! - various code cleanup and compilation fixes on Linux
2011-10-26 22:14:12 +00:00
parent 45f09972ad
commit c3dc51aed1
34 changed files with 410 additions and 297 deletions
@@ -120,85 +120,85 @@ class MTGGameZone {
 };

 class MTGLibrary: public MTGGameZone {
- public:
-  virtual ostream& toString(ostream&) const;
-  const char * getName(){return "library";}
+public:
+    virtual ostream& toString(ostream&) const;
+    const char * getName(){return "library";}
 };

 class MTGGraveyard: public MTGGameZone {
- public:
-  virtual ostream& toString(ostream&) const;
-  const char * getName(){return "graveyard";}
+public:
+    virtual ostream& toString(ostream&) const;
+    const char * getName(){return "graveyard";}
 };

 class MTGHand: public MTGGameZone {
- public:
-  virtual ostream& toString(ostream&) const;
-  const char * getName(){return "hand";}
+public:
+    virtual ostream& toString(ostream&) const;
+    const char * getName(){return "hand";}
 };

 class MTGRemovedFromGame: public MTGGameZone {
- public:
-  virtual ostream& toString(ostream&) const;
-  const char * getName(){return "exile";}
+public:
+    virtual ostream& toString(ostream&) const;
+    const char * getName(){return "exile";}
 };

 class MTGStack: public MTGGameZone {
- public:
-  virtual ostream& toString(ostream&) const;
-  const char * getName(){return "stack";}
+public:
+    virtual ostream& toString(ostream&) const;
+    const char * getName(){return "stack";}
 };

 class MTGInPlay: public MTGGameZone {
- public:
-  void untapAll();
-  MTGCardInstance * getNextAttacker(MTGCardInstance * previous);
-  virtual ostream& toString(ostream&) const;
-  const char * getName(){return "battlefield";}
+public:
+    void untapAll();
+    MTGCardInstance * getNextAttacker(MTGCardInstance * previous);
+    virtual ostream& toString(ostream&) const;
+    const char * getName(){return "battlefield";}
 };


 class MTGPlayerCards {
- protected:
-  void init();
+protected:
+    void init();

 public:
    Player * owner;
    PlayRestrictions * playRestrictions;
-  MTGLibrary * library;
-  MTGGraveyard * graveyard;
-  MTGHand * hand;
-  MTGInPlay * inPlay;
-  MTGInPlay * battlefield; //alias to inPlay
+    MTGLibrary * library;
+    MTGGraveyard * graveyard;
+    MTGHand * hand;
+    MTGInPlay * inPlay;
+    MTGInPlay * battlefield; //alias to inPlay

-  MTGStack * stack;
-  MTGRemovedFromGame * removedFromGame;
-  MTGRemovedFromGame * exile; //alias to removedFromZone
-  MTGGameZone * garbage;
-  MTGGameZone * temp;
+    MTGStack * stack;
+    MTGRemovedFromGame * removedFromGame;
+    MTGRemovedFromGame * exile; //alias to removedFromZone
+    MTGGameZone * garbage;
+    MTGGameZone * temp;

-  MTGPlayerCards();
-  MTGPlayerCards(Player*, int * idList, int idListSize);
-  MTGPlayerCards(MTGDeck * deck);
-  ~MTGPlayerCards();
-  void initGame(int shuffle = 1, int draw = 1);
-	void OptimizedHand(Player * who,int amount = 7,int lands = 3,int creatures = 0,int othercards = 4);
-  void setOwner(Player * player);
-  void discardRandom(MTGGameZone * from,MTGCardInstance * source);
-  void drawFromLibrary();
-  void showHand();
-  void resetLibrary();
-  void initDeck(MTGDeck * deck);
-  void beforeBeginPhase();
-  MTGCardInstance * putInGraveyard(MTGCardInstance * card);
-  MTGCardInstance * putInExile(MTGCardInstance * card);
-  MTGCardInstance * putInLibrary(MTGCardInstance * card);
-  MTGCardInstance * putInHand(MTGCardInstance * card);
-  MTGCardInstance * putInZone(MTGCardInstance * card, MTGGameZone * from, MTGGameZone * to);
-  int isInPlay(MTGCardInstance * card);
-  int isInGrave(MTGCardInstance * card);
-  int isInZone(MTGCardInstance * card,MTGGameZone * zone);
-  bool parseLine(const string& s);
+    MTGPlayerCards();
+    MTGPlayerCards(Player*, int * idList, int idListSize);
+    MTGPlayerCards(MTGDeck * deck);
+    ~MTGPlayerCards();
+    void initGame(int shuffle = 1, int draw = 1);
+        void OptimizedHand(Player * who,int amount = 7,int lands = 3,int creatures = 0,int othercards = 4);
+    void setOwner(Player * player);
+    void discardRandom(MTGGameZone * from,MTGCardInstance * source);
+    void drawFromLibrary();
+    void showHand();
+    void resetLibrary();
+    void initDeck(MTGDeck * deck);
+    void beforeBeginPhase();
+    MTGCardInstance * putInGraveyard(MTGCardInstance * card);
+    MTGCardInstance * putInExile(MTGCardInstance * card);
+    MTGCardInstance * putInLibrary(MTGCardInstance * card);
+    MTGCardInstance * putInHand(MTGCardInstance * card);
+    MTGCardInstance * putInZone(MTGCardInstance * card, MTGGameZone * from, MTGGameZone * to);
+    int isInPlay(MTGCardInstance * card);
+    int isInGrave(MTGCardInstance * card);
+    int isInZone(MTGCardInstance * card,MTGGameZone * zone);
+    bool parseLine(const string& s);
 };

 ostream& operator<<(ostream&, const MTGGameZone&);