switched geometric scalars from floating to fixed

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

diff --git a/src/battle/states/SelectItem.h b/src/battle/states/SelectItem.h
index 5fe98d0ec72996b9f289988a98605776383114cb..2bf4d594327af5aa0f574a5d6831ad928dc5825a 100644 (file)
--- a/src/battle/states/SelectItem.h
+++ b/src/battle/states/SelectItem.h
@@ -10,7 +10,7 @@
 
 #include "../fwd.h"
 #include "../../app/State.h"
-#include "../../geometry/Vector.h"
+#include "../../math/Vector.h"
 
 namespace battle {
 
@@ -19,27 +19,27 @@ class SelectItem
 
 public:
        SelectItem(BattleState *battle, SelectAttackType *parent)
-       : ctrl(0), battle(battle), parent(parent) { }
+       : battle(battle), parent(parent) { }
 
 public:
-       virtual void OnEnterState(app::Application &ctrl, SDL_Surface *screen);
-       virtual void OnExitState(app::Application &ctrl, SDL_Surface *screen);
-       virtual void OnResumeState(app::Application &ctrl, SDL_Surface *screen);
-       virtual void OnPauseState(app::Application &ctrl, SDL_Surface *screen);
-
-       virtual void OnResize(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 RenderFrame(SDL_Surface *, const geometry::Vector<int> &offset);
-       void RenderHeadline(SDL_Surface *, const geometry::Vector<int> &offset);
-       void RenderMenu(SDL_Surface *, 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 RenderFrame(SDL_Surface *, const math::Vector<int> &offset);
+       void RenderHeadline(SDL_Surface *, const math::Vector<int> &offset);
+       void RenderMenu(SDL_Surface *, const math::Vector<int> &offset);
 
 private:
-       app::Application *ctrl;
        BattleState *battle;
        SelectAttackType *parent;