- 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:
@@ -12,11 +12,10 @@ namespace CardSelectorSingleton
|
||||
{
|
||||
static CardSelectorBase* sCardSelectorInstance = NULL;
|
||||
|
||||
CardSelectorBase* Create(DuelLayers* inDuelLayers)
|
||||
CardSelectorBase* Create(GameObserver* observer, DuelLayers* inDuelLayers)
|
||||
{
|
||||
if (sCardSelectorInstance == NULL)
|
||||
sCardSelectorInstance = NEW CardSelector(inDuelLayers);
|
||||
//sCardSelectorInstance = NEW Navigator(inDuelLayers);
|
||||
sCardSelectorInstance = NEW CardSelector(observer, inDuelLayers);
|
||||
|
||||
return sCardSelectorInstance;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user