X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectIkari.h;h=254da726baa71831fac9fcf7713bf1d83dd362c3;hb=dc275497c592669dda75645604a9b35d32f63e90;hp=a7383a0535fd690b6f38b063b06366852f8acf71;hpb=7252571fb926a187c4c40e8f4eec718f16d63ffa;p=l2e.git

diff --git a/src/battle/states/SelectIkari.h b/src/battle/states/SelectIkari.h
index a7383a0..254da72 100644
--- a/src/battle/states/SelectIkari.h
+++ b/src/battle/states/SelectIkari.h
@@ -1,16 +1,13 @@
-/*
- * SelectIkari.h
- *
- *  Created on: Aug 9, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_SELECTIKARI_H_
 #define BATTLE_SELECTIKARI_H_
 
-#include "../fwd.h"
+namespace battle {
+	class BattleState;
+	class SelectAttackType;
+}
+
 #include "../../app/State.h"
-#include "../../geometry/Vector.h"
+#include "../../math/Vector.h"
 
 namespace battle {
 
@@ -20,33 +17,36 @@ class SelectIkari
 
 public:
 	SelectIkari(BattleState *battle, SelectAttackType *parent)
-	: ctrl(0), battle(battle), parent(parent) { }
+	: battle(battle), parent(parent) { }
 
 public:
 	virtual void HandleEvents(const app::Input &);
-	virtual void UpdateWorld(float deltaT);
+	virtual void UpdateWorld(Uint32 deltaT);
 	virtual void Render(SDL_Surface *);
 
 private:
-	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 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 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:
-	app::Application *ctrl;
 	BattleState *battle;
 	SelectAttackType *parent;
+	math::Vector<int> framePosition;
+	math::Vector<int> frameSize;
+	math::Vector<int> headlinePosition;
+	math::Vector<int> menuPosition;
 
 };
 
 }
 
-#endif /* BATTLE_SELECTIKARI_H_ */
+#endif