switched geometric scalars from floating to fixed

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

diff --git a/src/battle/states/SelectMoveAction.h b/src/battle/states/SelectMoveAction.h
index c1356631beb34421ed53da93d7e353db67dc0c82..0e973d4751c2e3698c9d1e8fc5a15bab6cdb74ca 100644 (file)
--- a/src/battle/states/SelectMoveAction.h
+++ b/src/battle/states/SelectMoveAction.h
@@ -8,37 +8,36 @@
 #ifndef BATTLE_SELECTMOVEACTION_H_
 #define BATTLE_SELECTMOVEACTION_H_
 
+#include "../fwd.h"
 #include "../../app/State.h"
-#include "../../geometry/Vector.h"
+#include "../../math/Vector.h"
 
 namespace battle {
 
-class BattleState;
-class MoveMenu;
-
 class SelectMoveAction
 : public app::State {
 
 public:
        explicit SelectMoveAction(BattleState *battle)
-       : ctrl(0), battle(battle) { }
-       ~SelectMoveAction() { }
+       : battle(battle) { }
 
 public:
-       virtual void EnterState(app::Application &ctrl, SDL_Surface *screen);
-       virtual void ExitState();
+       virtual void HandleEvents(const app::Input &);
+       virtual void UpdateWorld(Uint32 deltaT);
+       virtual void Render(SDL_Surface *);
 
-       virtual void Resize(int width, int height);
+private:
+       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 HandleInput(const app::Input &);
-       virtual void UpdateWorld(float deltaT);
-       virtual void Render(SDL_Surface *);
+       virtual void OnResize(int width, int height);
 
 private:
-       void RenderMenu(SDL_Surface *screen, const geometry::Vector<int> &offset);
+       void RenderMenu(SDL_Surface *screen, const math::Vector<int> &offset);
 
 private:
-       app::Application *ctrl;
        BattleState *battle;
 
 };