Cleaned up my phasebar code and merged it into the overall item selection code

projects/mtg/include/GuiPhaseBar.h

@@ -5,25 +5,22 @@
 #include "PhaseRing.h"
 #include "WEvent.h"
 
-class GuiPhaseBar: public GuiLayer
+class GuiPhaseBar: public GuiLayer, public PlayGuiObject
 {
 protected:
     Phase* phase;
     float angle;
-    float zoomTarget;
     float zoomFactor;
-    static GuiPhaseBar*instance;
-
-public:
-    static GuiPhaseBar* GetInstance();
 
 public:
     GuiPhaseBar();
     ~GuiPhaseBar();
     void Update(float dt);
-    void Zoom(float);
     virtual void Render();
     virtual int receiveEventMinus(WEvent * e);
+    virtual ostream& toString(ostream& out) const;
+    virtual void Entering();
+    virtual bool Leaving(JButton key);
 };
 
 #endif // _GUIPHASEBAR_H_

projects/mtg/include/MTGGamePhase.h

@@ -13,12 +13,16 @@ protected:
     float animation;
     int currentState;
     WFont * mFont;
+    static MTGGamePhase* instance;
+
 public:
     MTGGamePhase(int id);
+    static MTGGamePhase* GetInstance() { return instance; };
     virtual void Update(float dt);
     bool CheckUserInput(JButton key);
     virtual MTGGamePhase * clone() const;
     virtual ostream& toString(ostream& out) const;
+    bool NextGamePhase();
 };
 
 #endif