- reworked the testsuite and the rules (storyflow) to use the same game deserialization code, moved that code to the players and zone classes

- removed every references to the gameobserver singleton. This object can now be instantiated several times as it's needed for minmax. To be able to do that, I mostly added a reference to a gameobserver from any targetable object (cards, players, spells) and abilities.
2011-10-01 13:30:30 +00:00
parent d6db0c4f63
commit 9adb9d625d
86 changed files with 1902 additions and 1961 deletions
@@ -14,9 +14,10 @@ protected:
    int currentState;
    WFont * mFont;
    static MTGGamePhase* instance;
+    GameObserver* observer;

 public:
-    MTGGamePhase(int id);
+    MTGGamePhase(GameObserver* g, int id);
    static MTGGamePhase* GetInstance() { return instance; };
    virtual void Update(float dt);
    bool CheckUserInput(JButton key);