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

diff --git a/src/battle/states/SelectIkari.h b/src/battle/states/SelectIkari.h
index 02b0e25..254da72 100644
--- a/src/battle/states/SelectIkari.h
+++ b/src/battle/states/SelectIkari.h
@@ -1,54 +1,52 @@
-/*
- * SelectIkari.h
- *
- *  Created on: Aug 9, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_SELECTIKARI_H_
 #define BATTLE_SELECTIKARI_H_
 
-#include "../../app/State.h"
+namespace battle {
+	class BattleState;
+	class SelectAttackType;
+}
 
-#include "../../geometry/Vector.h"
+#include "../../app/State.h"
+#include "../../math/Vector.h"
 
 namespace battle {
 
-class BattleState;
-class SelectAttackType;
-
 // TODO: looks like item, spell, and ikari select can be merged into one class
 class SelectIkari
 : public app::State {
 
 public:
 	SelectIkari(BattleState *battle, SelectAttackType *parent)
-	: ctrl(0), battle(battle), parent(parent) { }
+	: battle(battle), parent(parent) { }
 
 public:
-	virtual void EnterState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void ExitState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void ResumeState(app::Application &ctrl, SDL_Surface *screen);
-	virtual void PauseState(app::Application &ctrl, SDL_Surface *screen);
-
-	virtual void Resize(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 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);
+	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 *);
+	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