X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectIkari.h;h=e665c696c22cb1240630e9b644be0b3c2cf0ce31;hb=c49d46cbfbd7720627af2414e94963850fe8eed6;hp=1550ed8844047709ee7d5d670f8b9b032a710f9d;hpb=b782e097508340f375a06f0f293775eb86c3df9c;p=l2e.git

diff --git a/src/battle/states/SelectIkari.h b/src/battle/states/SelectIkari.h
index 1550ed8..e665c69 100644
--- a/src/battle/states/SelectIkari.h
+++ b/src/battle/states/SelectIkari.h
@@ -8,42 +8,39 @@
 #ifndef BATTLE_SELECTIKARI_H_
 #define BATTLE_SELECTIKARI_H_
 
+#include "../fwd.h"
 #include "../../app/State.h"
-
-#include "../../geometry/Vector.h"
+#include "../../math/Vector.h"
 
 namespace battle {
 
-class BattleState;
-class SelectAttackType;
-
 // TODO: looks like item, spell, and ikari select can be merged into one class
 class SelectIkari
 : public app::State {
 
 public:
 	SelectIkari(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;