reworked Application's state stack

[l2e.git] / src / app / Application.h

diff --git a/src/app/Application.h b/src/app/Application.h
index e43faf44e1692b0905d079d25b95084f5262edaf..853d0cb25cefc91897beeaa41e7365f027a2604a 100644 (file)
--- a/src/app/Application.h
+++ b/src/app/Application.h
@@ -8,10 +8,12 @@
 #ifndef APP_APPLICATION_H_
 #define APP_APPLICATION_H_
 
+#include "Input.h"
 #include "../sdl/InitScreen.h"
 
 #include <stack>
-#include <SDL/SDL.h>
+#include <queue>
+#include <SDL.h>
 
 
 namespace app {
@@ -21,36 +23,50 @@ class State;
 class Application {
 
 public:
-       explicit Application(SDL_Surface *screen, State *initialState);
-       ~Application(void);
+       Application(sdl::InitScreen *screen, State *initialState);
+       ~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; }
 
 private:
-       State *CurrentState(void);
+       struct StateCommand {
+               enum Type {
+                       PUSH, POP, CHANGE
+               } type;
+               State *state;
+       };
+
+private:
+       State *CurrentState();
+       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_Surface *screen;
+       sdl::InitScreen *screen;
        std::stack<State *> states;
+       std::queue<StateCommand> stateChanges;
+       Input input;
        Uint32 last;
 
 };