Some organisational prep work before I start working on a new navigation method (ie replacement for CardSelector). The current design was to allocate a CardSelector and pass in its pointer to a variety of classes via their constructors. To simplify things, now we use a singleton style pattern with an Instance() function - this means that when I implement a new class to replace CardSelector, I only need to modify what's returned by the singleton callback - as long as the new pointer class supports the same function calls, it'll be a straight drop-in.

projects/mtg/include/GuiPlay.h

@@ -71,13 +71,12 @@ class GuiPlay : public GuiLayer
   BattleField battleField;
   Lands selfLands, opponentLands;
   Spells selfSpells, opponentSpells;
-  CardSelector* cs;
   iterator end_spells;
 
   vector<CardView*> cards;
 
  public:
-  GuiPlay(GameObserver*, CardSelector*);
+  GuiPlay(GameObserver*);
   ~GuiPlay();
   virtual void Render();
   void Replace();