X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectSpell.h;h=84df91eefc4751da7be3b4e9dea1724d439f0482;hb=HEAD;hp=1087b3fd1b7bc53b86124a8a1d88cdb577cd169f;hpb=4309d259becd96ead792678257e910c03a6b4a3d;p=l2e.git

diff --git a/src/battle/states/SelectSpell.h b/src/battle/states/SelectSpell.h
index 1087b3f..84df91e 100644
--- a/src/battle/states/SelectSpell.h
+++ b/src/battle/states/SelectSpell.h
@@ -2,15 +2,12 @@
 #define BATTLE_SELECTSPELL_H_
 
 namespace battle {
-	class BattleState;
+	class Battle;
 	class SelectAttackType;
 }
-namespace math {
-	template<class>
-	class Vector;
-}
 
 #include "../../app/State.h"
+#include "../../math/Vector.h"
 
 namespace battle {
 
@@ -18,8 +15,7 @@ class SelectSpell
 : public app::State {
 
 public:
-	SelectSpell(BattleState *battle, SelectAttackType *parent)
-	: battle(battle), parent(parent) { }
+	SelectSpell(Battle *battle, SelectAttackType *parent);
 
 public:
 	virtual void HandleEvents(const app::Input &);
@@ -35,13 +31,17 @@ private:
 	virtual void OnResize(int width, int height);
 
 private:
-	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);
+	void RenderFrame(SDL_Surface *);
+	void RenderHeadline(SDL_Surface *);
+	void RenderMenu(SDL_Surface *);
 
 private:
-	BattleState *battle;
+	Battle *battle;
 	SelectAttackType *parent;
+	math::Vector<int> framePosition;
+	math::Vector<int> frameSize;
+	math::Vector<int> headlinePosition;
+	math::Vector<int> menuPosition;
 
 };