removed lazy fwd headers

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

diff --git a/src/battle/states/SelectAttackType.h b/src/battle/states/SelectAttackType.h
index aa0a30384a0fb86b1ba555faf76e4dbf6f86ef5c..3290666b3d0d33855a5beaca925279749ab6b77d 100644 (file)
--- a/src/battle/states/SelectAttackType.h
+++ b/src/battle/states/SelectAttackType.h
@@ -8,38 +8,42 @@
 #ifndef BATTLE_SELECTATTACKTYPE_H_
 #define BATTLE_SELECTATTACKTYPE_H_
 
+namespace battle {
+       class BattleState;
+}
+namespace math {
+       template<class>
+       class Vector;
+}
+
 #include "../../app/State.h"
-#include "../../geometry/Vector.h"
 
 namespace battle {
 
-class AttackTypeMenu;
-class BattleState;
-
 class SelectAttackType
 : public app::State {
 
 public:
        explicit SelectAttackType(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 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;
 
 };