- 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:
@@ -24,8 +24,9 @@ class CardSelectorBase: public GuiLayer
|
||||
{
|
||||
public:
|
||||
|
||||
CardSelectorBase(int inDrawMode = DrawMode::kNormal) :
|
||||
mDrawMode(inDrawMode)
|
||||
CardSelectorBase(GameObserver *observer, int inDrawMode = DrawMode::kNormal) :
|
||||
GuiLayer(observer), mDrawMode(inDrawMode)
|
||||
|
||||
{
|
||||
}
|
||||
;
|
||||
@@ -70,7 +71,7 @@ protected:
|
||||
PlayGuiObject* fetchMemory(SelectorMemory&);
|
||||
|
||||
public:
|
||||
CardSelector(DuelLayers*);
|
||||
CardSelector(GameObserver *observer, DuelLayers*);
|
||||
void Add(PlayGuiObject*);
|
||||
void Remove(PlayGuiObject*);
|
||||
bool CheckUserInput(JButton key);
|
||||
|
||||
Reference in New Issue
Block a user