X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectMoveAction.h;h=0e973d4751c2e3698c9d1e8fc5a15bab6cdb74ca;hb=5d1a76ae7725af998c6ee46adfe492c68ee1d34f;hp=9ba8c6115f500d745e36f875ee9e4d04b42fc946;hpb=58c4bd0571f6d839df5ddb9fa02d8d0d54ad4454;p=l2e.git

diff --git a/src/battle/states/SelectMoveAction.h b/src/battle/states/SelectMoveAction.h
index 9ba8c61..0e973d4 100644
--- a/src/battle/states/SelectMoveAction.h
+++ b/src/battle/states/SelectMoveAction.h
@@ -8,38 +8,36 @@
 #ifndef BATTLE_SELECTMOVEACTION_H_
 #define BATTLE_SELECTMOVEACTION_H_
 
+#include "../fwd.h"
 #include "../../app/State.h"
-#include "../../geometry/Vector.h"
+#include "../../math/Vector.h"
 
 namespace battle {
 
-class BattleState;
-class MoveMenu;
-
 class SelectMoveAction
 : public app::State {
 
 public:
 	explicit SelectMoveAction(BattleState *battle)
-	: ctrl(0), battle(battle) { }
+	: 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;
 
 };