X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectSpell.h;h=823bef2395dab65613391576ed2c2a24f84e1d46;hb=2ccc2369d32fb680a3047519d79c17de34c4e10a;hp=e0bb118040e24b09d6214203b2c789f5f5e67bf1;hpb=185c6c79f8ba30981aad4e1d66f98143a344b95e;p=l2e.git

diff --git a/src/battle/states/SelectSpell.h b/src/battle/states/SelectSpell.h
index e0bb118..823bef2 100644
--- a/src/battle/states/SelectSpell.h
+++ b/src/battle/states/SelectSpell.h
@@ -8,13 +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 {
 
@@ -23,17 +22,22 @@ 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 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 OnResize(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:
+	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);
+
 private:
 	app::Application *ctrl;
 	BattleState *battle;