- 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.
This commit is contained in:
@@ -16,6 +16,7 @@ class GuiLayer
|
||||
{
|
||||
protected:
|
||||
JButton mActionButton;
|
||||
GameObserver* observer;
|
||||
public:
|
||||
int mCurr;
|
||||
vector<JGuiObject *> mObjects;
|
||||
@@ -26,7 +27,7 @@ public:
|
||||
bool hasFocus;
|
||||
virtual void resetObjects();
|
||||
int getMaxId();
|
||||
GuiLayer();
|
||||
GuiLayer(GameObserver *observer);
|
||||
virtual ~GuiLayer();
|
||||
virtual void Update(float dt);
|
||||
virtual bool CheckUserInput(JButton key)
|
||||
|
||||
Reference in New Issue
Block a user