X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectIkari.h;h=9b46deb5e88a8305783cabff32eb67bd6b6dbd50;hb=b7b7078d04007d5b86ab160288f88b57d76ea408;hp=060a8124d693abac6677d21a7e4d106d11f470ec;hpb=092a2dd175a4001a495c84ee85211734fb928c83;p=l2e.git

diff --git a/src/battle/states/SelectIkari.h b/src/battle/states/SelectIkari.h
index 060a812..9b46deb 100644
--- a/src/battle/states/SelectIkari.h
+++ b/src/battle/states/SelectIkari.h
@@ -1,23 +1,13 @@
-/*
- * SelectIkari.h
- *
- *  Created on: Aug 9, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_SELECTIKARI_H_
 #define BATTLE_SELECTIKARI_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 {
 
@@ -26,8 +16,7 @@ class SelectIkari
 : public app::State {
 
 public:
-	SelectIkari(BattleState *battle, SelectAttackType *parent)
-	: battle(battle), parent(parent) { }
+	SelectIkari(Battle *battle, SelectAttackType *parent);
 
 public:
 	virtual void HandleEvents(const app::Input &);
@@ -43,16 +32,20 @@ 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;
 
 };
 
 }
 
-#endif /* BATTLE_SELECTIKARI_H_ */
+#endif