switched geometric scalars from floating to fixed

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

diff --git a/src/battle/states/RunState.h b/src/battle/states/RunState.h
index 7af5461020c1439fa10ccc6f578404730144f0db..f21280ee224a21ef1cbe6b7f470fddc4dfdb9453 100644 (file)
--- a/src/battle/states/RunState.h
+++ b/src/battle/states/RunState.h
@@ -10,7 +10,7 @@
 
 #include "../fwd.h"
 #include "../../app/State.h"
-#include "../../geometry/Vector.h"
+#include "../../math/Vector.h"
 
 namespace battle {
 
@@ -19,25 +19,26 @@ class RunState
 
 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:
-       void RenderTitleBar(SDL_Surface *screen, const geometry::Vector<int> &offset);
+       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:
-       app::Application *ctrl;
        BattleState *battle;
        app::Timer<Uint32> timer;