X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectSpell.h;h=64cc85206c8c24f424d241d37d79f1c8454b513a;hb=eb2ad5ffd08128d31af32f3929a3295fcfa251e9;hp=514a2b8a6b55175ad1ce5e596b4d9e458190ac00;hpb=5ca18f73987fb3935ab34654cbbecf5eca4704cb;p=l2e.git

diff --git a/src/battle/states/SelectSpell.h b/src/battle/states/SelectSpell.h
index 514a2b8..64cc852 100644
--- a/src/battle/states/SelectSpell.h
+++ b/src/battle/states/SelectSpell.h
@@ -1,16 +1,13 @@
-/*
- * SelectSpell.h
- *
- *  Created on: Aug 8, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_SELECTSPELL_H_
 #define BATTLE_SELECTSPELL_H_
 
-#include "../fwd.h"
+namespace battle {
+	class BattleState;
+	class SelectAttackType;
+}
+
 #include "../../app/State.h"
-#include "../../geometry/Vector.h"
+#include "../../math/Vector.h"
 
 namespace battle {
 
@@ -23,7 +20,7 @@ public:
 
 public:
 	virtual void HandleEvents(const app::Input &);
-	virtual void UpdateWorld(float deltaT);
+	virtual void UpdateWorld(Uint32 deltaT);
 	virtual void Render(SDL_Surface *);
 
 private:
@@ -35,16 +32,20 @@ private:
 	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 *);
+	void RenderHeadline(SDL_Surface *);
+	void RenderMenu(SDL_Surface *);
 
 private:
 	BattleState *battle;
 	SelectAttackType *parent;
+	math::Vector<int> framePosition;
+	math::Vector<int> frameSize;
+	math::Vector<int> headlinePosition;
+	math::Vector<int> menuPosition;
 
 };
 
 }
 
-#endif /* BATTLE_SELECTSPELL_H_ */
+#endif