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/GuiAvatars.h

@@ -15,12 +15,11 @@ class GuiAvatars : public GuiLayer
   GuiGraveyard* selfGraveyard, *opponentGraveyard;
   GuiLibrary* selfLibrary, *opponentLibrary;
   GuiOpponentHand *opponentHand;
-  CardSelector* cs;
   GuiAvatar* active;
   
 
  public:
-	GuiAvatars(CardSelector*);
+	GuiAvatars();
   ~GuiAvatars();
 
 	GuiAvatar* GetSelf();