X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectTarget.h;h=9bdc470519a7d1ce98e2006f2ffff954547cc2fe;hb=dc275497c592669dda75645604a9b35d32f63e90;hp=01ebba72315dffee10258c84b8daabcf59f0e747;hpb=3f8fac16c7ae2cbe7da47b98aba9b558825723e7;p=l2e.git

diff --git a/src/battle/states/SelectTarget.h b/src/battle/states/SelectTarget.h
index 01ebba7..9bdc470 100644
--- a/src/battle/states/SelectTarget.h
+++ b/src/battle/states/SelectTarget.h
@@ -1,17 +1,19 @@
-/*
- * SelectTarget.h
- *
- *  Created on: Aug 9, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_SELECTTARGET_H_
 #define BATTLE_SELECTTARGET_H_
 
-#include "../fwd.h"
+namespace battle {
+	class BattleState;
+	class SelectAttackType;
+	class TargetSelection;
+}
+namespace graphics {
+	class Sprite;
+}
+
 #include "../../app/State.h"
-#include "../../geometry/Vector.h"
-#include "../../graphics/fwd.h"
+#include "../../math/Vector.h"
+
+#include <vector>
 
 namespace battle {
 
@@ -24,29 +26,33 @@ public:
 
 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 RenderCursors(SDL_Surface *screen, const geometry::Vector<int> &offset);
+	void RenderCursors(SDL_Surface *screen);
 
 private:
 	BattleState *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