X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectAttackType.h;h=3290666b3d0d33855a5beaca925279749ab6b77d;hb=092a2dd175a4001a495c84ee85211734fb928c83;hp=b2974bb423ecdf68105e6209c977474b358b3a7a;hpb=2a0eca649009f78028db286a67a532429cab5b88;p=l2e.git

diff --git a/src/battle/states/SelectAttackType.h b/src/battle/states/SelectAttackType.h
index b2974bb..3290666 100644
--- a/src/battle/states/SelectAttackType.h
+++ b/src/battle/states/SelectAttackType.h
@@ -8,39 +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) { }
-	~SelectAttackType() { }
+	: 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;
 
 };