X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FApplication.h;h=cf1261b28f1a8c8799c3ce8aa2a5217af9ef3ab2;hb=bbf7120b50c68867fe48844abc93ff1383bf5ec7;hp=909942b829730020ecd598e368bcbaefc4d7edcb;hpb=4a1816af30dcfe53181a25355bd51cc7b24a83f1;p=l2e.git

diff --git a/src/app/Application.h b/src/app/Application.h
index 909942b..cf1261b 100644
--- a/src/app/Application.h
+++ b/src/app/Application.h
@@ -8,9 +8,12 @@
 #ifndef APP_APPLICATION_H_
 #define APP_APPLICATION_H_
 
+#include "Input.h"
+#include "Timer.h"
 #include "../sdl/InitScreen.h"
 
 #include <stack>
+#include <queue>
 #include <SDL.h>
 
 
@@ -22,35 +25,52 @@ class Application {
 
 public:
 	Application(sdl::InitScreen *screen, State *initialState);
-	~Application(void);
+	~Application();
 private:
 	Application(const Application &);
 	Application &operator =(const Application &);
 
 public:
-	void Run(void);
-	void Loop(void);
+	void Run();
+	void Loop();
 
 public:
 	void ChangeState(State *);
 	void PushState(State *);
-	void PopState(void);
-	void Quit(void);
+	void PopState();
+	void Quit();
+	Input &Buttons() { return input; }
+	const Input &Buttons() const { return input; }
+	Timers<Uint32> &GlobalTimers() { return globalTimers; }
 
 private:
-	State *CurrentState(void);
+	struct StateCommand {
+		enum Type {
+			PUSH, POP, CHANGE
+		} type;
+		State *state;
+	};
+
+private:
+	State *CurrentState();
+	bool StateChangePending() const { return !stateChanges.empty(); }
+	void UpdateState();
+	void RealChangeState(State *);
 	void RealPushState(State *);
-	void RealPopState(void);
-	void PopAllStates(void);
+	void RealPopState();
+	void PopAllStates();
 
 private:
-	void HandleEvents(void);
+	void HandleEvents();
 	void UpdateWorld(Uint32 deltaT);
-	void Render(void);
+	void Render();
 
 private:
 	sdl::InitScreen *screen;
 	std::stack<State *> states;
+	std::queue<StateCommand> stateChanges;
+	Timers<Uint32> globalTimers;
+	Input input;
 	Uint32 last;
 
 };