X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2Fstates%2FSelectTarget.h;h=29035c8352b6d7f975067559da0f5228f97fcc3b;hb=087783315ac5955c17bb3b051c9351f321653df6;hp=4d53c3c76f76491abdb8e2815e5ae8e43d217300;hpb=4309d259becd96ead792678257e910c03a6b4a3d;p=l2e.git

diff --git a/src/battle/states/SelectTarget.h b/src/battle/states/SelectTarget.h
index 4d53c3c..29035c8 100644
--- a/src/battle/states/SelectTarget.h
+++ b/src/battle/states/SelectTarget.h
@@ -2,19 +2,18 @@
 #define BATTLE_SELECTTARGET_H_
 
 namespace battle {
-	class BattleState;
+	class Battle;
 	class SelectAttackType;
 	class TargetSelection;
 }
-namespace math {
-	template<class>
-	class Vector;
-}
 namespace graphics {
 	class Sprite;
 }
 
 #include "../../app/State.h"
+#include "../../math/Vector.h"
+
+#include <vector>
 
 namespace battle {
 
@@ -22,8 +21,10 @@ class SelectTarget
 : public app::State {
 
 public:
-	SelectTarget(BattleState *battle, SelectAttackType *parent, TargetSelection *selection, const graphics::Sprite *cursorIcon)
-	: battle(battle), parent(parent), selection(selection), cursorIcon(cursorIcon), flipFlop(true) { }
+	SelectTarget(Battle *battle,
+			SelectAttackType *parent,
+			TargetSelection *selection,
+			const graphics::Sprite *cursorIcon);
 
 public:
 	virtual void HandleEvents(const app::Input &);
@@ -39,13 +40,17 @@ private:
 	virtual void OnResize(int width, int height);
 
 private:
-	void RenderCursors(SDL_Surface *screen, const math::Vector<int> &offset);
+	void RenderCursors(SDL_Surface *screen);
 
 private:
-	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;
 
 };