More stuff, better events and starting on interface

4 files changed, 9 insertions, 6 deletions

diff --git a/includes/interface/Button.h b/includes/interface/Button.h
index 86688cf..9046ea1 100644
--- a/includes/interface/Button.h
+++ b/includes/interface/Button.h
@@ -39,9 +39,13 @@ namespace ui
 
         inline bool GetState() { return state; }
         virtual void DoAction(); //action of button what ever it may be
+		void SetTogglable(bool isTogglable);
+		bool GetTogglable();
+		inline bool GetToggleState();
+		inline void SetToggleState(bool state);
 
     protected:
-        bool isButtonDown, state, isMouseInside;
+		bool isButtonDown, state, isMouseInside, isTogglable, toggle;
     };
 }
 #endif /* BUTTON_H_ */
diff --git a/includes/interface/ControlFactory.h b/includes/interface/ControlFactory.h
index ba5f43b..0f8ad61 100644
--- a/includes/interface/ControlFactory.h
+++ b/includes/interface/ControlFactory.h
@@ -3,12 +3,11 @@
 
 #include "Panel.h"
 #include "Engine.h"
-#include "GameSession.h"
 
 class ControlFactory
 {
 public:
-	static ui::Panel * MainMenu(GameSession * session, int x, int y, int width, int height);
+	static ui::Panel * MainMenu(int x, int y, int width, int height);
 
 };
 
diff --git a/includes/interface/Engine.h b/includes/interface/Engine.h
index 682a09d..6136fb4 100644
--- a/includes/interface/Engine.h
+++ b/includes/interface/Engine.h
@@ -30,7 +30,7 @@ namespace ui
 		void onResize(int newWidth, int newHeight);
 		void onClose();
 
-		void Begin(int width, int height, SDL_Surface * surface);
+		void Begin(int width, int height);
 		inline bool Running() { return running_; }
 		void Exit();
 
@@ -46,7 +46,7 @@ namespace ui
 		
 		void SetState(State* state);
 		inline State* GetState() { return state_; }
-		Graphics * g;
+		float FpsLimit;
 	private:
 		State* statequeued_;
 		State* state_;
diff --git a/includes/interface/Sandbox.h b/includes/interface/Sandbox.h
index f4daa87..fb4a668 100644
--- a/includes/interface/Sandbox.h
+++ b/includes/interface/Sandbox.h
@@ -29,7 +29,7 @@ public:
 	virtual Simulation * GetSimulation();
 	virtual void OnMouseMoved(int localx, int localy, int dx, int dy);
 	virtual void OnMouseClick(int localx, int localy, unsigned int button);
-	virtual void OnMouseUnclick(int localx, int localy, unsigned int button);
+	virtual void OnMouseUp(int localx, int localy, unsigned int button);
 	virtual void Draw(const Point& screenPos);
 	virtual void Tick(float delta);
 	virtual ~Sandbox();