renamed namespace geometry -> math

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

diff --git a/src/battle/states/SelectAttackType.h b/src/battle/states/SelectAttackType.h
index 6acaaef8e15bc39b75f166257e464bb6569f6323..c096fa02a5b70903ad057c2998f60ee7b407415f 100644 (file)
--- a/src/battle/states/SelectAttackType.h
+++ b/src/battle/states/SelectAttackType.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,25 @@ class SelectAttackType
 
 public:
        explicit SelectAttackType(BattleState *battle)
-       : ctrl(0), battle(battle) { }
+       : battle(battle) { }
 
 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 Resize(int width, int height);
-
        virtual void HandleEvents(const app::Input &);
        virtual void UpdateWorld(float deltaT);
        virtual void Render(SDL_Surface *);
 
 private:
-       void RenderMenu(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 RenderMenu(SDL_Surface *screen, const math::Vector<int> &offset);
 
 private:
-       app::Application *ctrl;
        BattleState *battle;
 
 };