- 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
@@ -38,6 +38,7 @@ private:
 public:
    int value;
    Player * p1, *p2;
+    GameObserver* observer;
    GameApp * app;
    int showMsg;
    int unlocked;
@@ -45,7 +46,7 @@ public:
    vector<CreditBonus *> bonus;
    Credits();
    ~Credits();
-    void compute(Player * _p1, Player * _p2, GameApp * _app);
+    void compute(GameObserver* observer, GameApp * _app);
    void Render();
    static int unlockRandomSet(bool force = false);
    static int unlockSetByName(string name);