X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectAttackType.h;h=8794a48c2f45cbbcbc945bd32aec188ba6b0c16b;hb=0b11a24a8b08c49d6e4301573602fb6d01e7a8c8;hp=690427f070371270a0b0ffef0a06a9e229c1244d;hpb=2ccc2369d32fb680a3047519d79c17de34c4e10a;p=l2e.git

diff --git a/src/battle/states/SelectAttackType.h b/src/battle/states/SelectAttackType.h
index 690427f..8794a48 100644
--- a/src/battle/states/SelectAttackType.h
+++ b/src/battle/states/SelectAttackType.h
@@ -1,16 +1,12 @@
-/*
- * SelectAttackType.h
- *
- *  Created on: Aug 7, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_SELECTATTACKTYPE_H_
 #define BATTLE_SELECTATTACKTYPE_H_
 
-#include "../fwd.h"
+namespace battle {
+	class BattleState;
+}
+
 #include "../../app/State.h"
-#include "../../geometry/Vector.h"
+#include "../../math/Vector.h"
 
 namespace battle {
 
@@ -19,28 +15,29 @@ class SelectAttackType
 
 public:
 	explicit SelectAttackType(BattleState *battle)
-	: ctrl(0), battle(battle) { }
+	: battle(battle) { }
 
 public:
-	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);
-
 	virtual void HandleEvents(const app::Input &);
-	virtual void UpdateWorld(float deltaT);
+	virtual void UpdateWorld(Uint32 deltaT);
 	virtual void Render(SDL_Surface *);
 
 private:
-	void RenderMenu(SDL_Surface *screen, const geometry::Vector<int> &offset);
+	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 OnResize(int width, int height);
+
+private:
+	void RenderMenu(SDL_Surface *screen);
 
 private:
-	app::Application *ctrl;
 	BattleState *battle;
+	math::Vector<int> menuOffset;
 
 };
 
 }
-#endif /* BATTLE_SELECTATTACKTYPE_H_ */
+#endif