renamed namespace geometry -> math

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

diff --git a/src/battle/states/SwapHeroes.h b/src/battle/states/SwapHeroes.h
index 8ad92981c6eeae5952563d8c6272b45addbba943..14d0d723c9611dca6a96db884a2ed0b6135329b3 100644 (file)
--- a/src/battle/states/SwapHeroes.h
+++ b/src/battle/states/SwapHeroes.h
@@ -10,7 +10,7 @@
 
 #include "../fwd.h"
 #include "../../app/State.h"
-#include "../../geometry/Vector.h"
+#include "../../math/Vector.h"
 
 namespace battle {
 
@@ -19,20 +19,21 @@ class SwapHeroes
 
 public:
        SwapHeroes(BattleState *battle, SelectMoveAction *parent)
-       : ctrl(0), battle(battle), parent(parent), cursor(0), selected(-1), flipFlop(true) { }
+       : battle(battle), parent(parent), cursor(0), selected(-1), flipFlop(true) { }
 
 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 Render(SDL_Surface *);
 
+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 OnResize(int width, int height);
+
 private:
        void MoveUp();
        void MoveRight();
@@ -40,10 +41,9 @@ private:
        void MoveLeft();
 
 private:
-       void RenderCursors(SDL_Surface *screen, const geometry::Vector<int> &offset);
+       void RenderCursors(SDL_Surface *screen, const math::Vector<int> &offset);
 
 private:
-       app::Application *ctrl;
        BattleState *battle;
        SelectMoveAction *parent;
        int cursor;