removed lazy fwd headers

[l2e.git] / src / battle / states / RunState.h

diff --git a/src/battle/states/RunState.h b/src/battle/states/RunState.h
index 870f48d5abf5c744b794b1532b723b838f5732e4..9a3a85608c47aa08d25d18e814189cd93e36b5f7 100644 (file)
--- a/src/battle/states/RunState.h
+++ b/src/battle/states/RunState.h
@@ -8,35 +8,43 @@
 #ifndef BATTLE_RUNSTATE_H_
 #define BATTLE_RUNSTATE_H_
 
-#include "../../app/State.h"
+namespace battle {
+       class BattleState;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
 
-#include "../../geometry/Vector.h"
+#include "../../app/State.h"
 
 namespace battle {
 
-class BattleState;
-
 class RunState
 : public app::State {
 
 public:
        explicit RunState(BattleState *battle)
-       : ctrl(0), battle(battle){ }
+       : battle(battle){ }
 
 public:
-       virtual void EnterState(app::Application &ctrl, SDL_Surface *screen);
-       virtual void ExitState(app::Application &ctrl, SDL_Surface *screen);
-       virtual void ResumeState(app::Application &ctrl, SDL_Surface *screen);
-       virtual void PauseState(app::Application &ctrl, SDL_Surface *screen);
-
-       virtual void Resize(int width, int height);
 
        virtual void HandleEvents(const app::Input &);
-       virtual void UpdateWorld(float deltaT);
+       virtual void UpdateWorld(Uint32 deltaT);
        virtual void Render(SDL_Surface *);
 
 private:
-       app::Application *ctrl;
+       virtual void OnEnterState(SDL_Surface *screen);
+       virtual void OnExitState(SDL_Surface *screen);
+       virtual void OnResumeState(SDL_Surface *screen);
+       virtual void OnPauseState(SDL_Surface *screen);
+
+       virtual void OnResize(int width, int height);
+
+private:
+       void RenderTitleBar(SDL_Surface *screen, const math::Vector<int> &offset);
+
+private:
        BattleState *battle;
        app::Timer<Uint32> timer;