X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectTarget.h;h=29035c8352b6d7f975067559da0f5228f97fcc3b;hb=087783315ac5955c17bb3b051c9351f321653df6;hp=b4eb312810223a73efd54798dbc38e14a4a2dd6c;hpb=6d080d21d8055df9962296863b4c0954bc81410b;p=l2e.git

diff --git a/src/battle/states/SelectTarget.h b/src/battle/states/SelectTarget.h
index b4eb312..29035c8 100644
--- a/src/battle/states/SelectTarget.h
+++ b/src/battle/states/SelectTarget.h
@@ -1,57 +1,60 @@
-/*
- * SelectTarget.h
- *
- *  Created on: Aug 9, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_SELECTTARGET_H_
 #define BATTLE_SELECTTARGET_H_
 
-#include "../../app/State.h"
+namespace battle {
+	class Battle;
+	class SelectAttackType;
+	class TargetSelection;
+}
+namespace graphics {
+	class Sprite;
+}
 
-#include "../../geometry/Vector.h"
+#include "../../app/State.h"
+#include "../../math/Vector.h"
 
-namespace graphics { class Sprite; }
+#include <vector>
 
 namespace battle {
 
-class BattleState;
-class TargetSelection;
-class SelectAttackType;
-
 class SelectTarget
 : public app::State {
 
 public:
-	SelectTarget(BattleState *battle, SelectAttackType *parent, TargetSelection *selection, const graphics::Sprite *cursorIcon)
-	: ctrl(0), battle(battle), parent(parent), selection(selection), cursorIcon(cursorIcon), flipFlop(true) { }
+	SelectTarget(Battle *battle,
+			SelectAttackType *parent,
+			TargetSelection *selection,
+			const graphics::Sprite *cursorIcon);
 
 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 RenderCursors(SDL_Surface *screen, 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 RenderCursors(SDL_Surface *screen);
 
 private:
-	app::Application *ctrl;
-	BattleState *battle;
+	Battle *battle;
 	SelectAttackType *parent;
 	TargetSelection *selection;
 	const graphics::Sprite *cursorIcon;
+	std::vector<math::Vector<int> > monsterPositions;
+	std::vector<math::Vector<int> > heroPositions;
+	math::Vector<int> cursorOffset;
+	math::Vector<int> indicatorOffset;
 	bool flipFlop;
 
 };
 
 }
 
-#endif /* BATTLE_SELECTTARGET_H_ */
+#endif