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

diff --git a/src/battle/states/SelectSpell.h b/src/battle/states/SelectSpell.h
index eda7e91..7a0bad4 100644
--- a/src/battle/states/SelectSpell.h
+++ b/src/battle/states/SelectSpell.h
@@ -8,15 +8,12 @@
 #ifndef BATTLE_SELECTSPELL_H_
 #define BATTLE_SELECTSPELL_H_
 
+#include "../fwd.h"
 #include "../../app/State.h"
-
 #include "../../geometry/Vector.h"
 
 namespace battle {
 
-class BattleState;
-class SelectAttackType;
-
 class SelectSpell
 : public app::State {
 
@@ -25,17 +22,18 @@ public:
 	: ctrl(0), 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 Resize(int width, int height);
-
-	virtual void HandleInput(const app::Input &);
+	virtual void HandleEvents(const app::Input &);
 	virtual void UpdateWorld(float deltaT);
 	virtual void Render(SDL_Surface *);
 
+private:
+	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 OnResize(int width, int height);
+
 private:
 	void RenderFrame(SDL_Surface *, const geometry::Vector<int> &offset);
 	void RenderHeadline(SDL_Surface *, const geometry::Vector<int> &offset);