X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectSpell.h;h=03401c6bcbefef7557025059e4ec4f61b587ba5d;hb=092a2dd175a4001a495c84ee85211734fb928c83;hp=eda7e9166820b976ffe703a5e07173d7ac9716a7;hpb=4bdbcf13343cee3f4fcc4ed7057e18eb6fe49703;p=l2e.git

diff --git a/src/battle/states/SelectSpell.h b/src/battle/states/SelectSpell.h
index eda7e91..03401c6 100644
--- a/src/battle/states/SelectSpell.h
+++ b/src/battle/states/SelectSpell.h
@@ -8,41 +8,45 @@
 #ifndef BATTLE_SELECTSPELL_H_
 #define BATTLE_SELECTSPELL_H_
 
-#include "../../app/State.h"
+namespace battle {
+	class BattleState;
+	class SelectAttackType;
+}
+namespace math {
+	template<class>
+	class Vector;
+}
 
-#include "../../geometry/Vector.h"
+#include "../../app/State.h"
 
 namespace battle {
 
-class BattleState;
-class SelectAttackType;
-
 class SelectSpell
 : public app::State {
 
 public:
 	SelectSpell(BattleState *battle, SelectAttackType *parent)
-	: ctrl(0), battle(battle), parent(parent) { }
+	: battle(battle), parent(parent) { }
 
 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 RenderFrame(SDL_Surface *, const geometry::Vector<int> &offset);
-	void RenderHeadline(SDL_Surface *, const geometry::Vector<int> &offset);
-	void RenderMenu(SDL_Surface *, const geometry::Vector<int> &offset);
+	void RenderFrame(SDL_Surface *, const math::Vector<int> &offset);
+	void RenderHeadline(SDL_Surface *, const math::Vector<int> &offset);
+	void RenderMenu(SDL_Surface *, const math::Vector<int> &offset);
 
 private:
-	app::Application *ctrl;
 	BattleState *battle;
 	SelectAttackType *parent;