X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FCapsule.h;h=dc2ac6e994826bd4e7357a9fa9b6180e6d26c5a3;hb=eb2ad5ffd08128d31af32f3929a3295fcfa251e9;hp=7438492bc7f86a7046b999fc42ee4fb8e8755b18;hpb=60e0fe29ce6cd033edc78b181d9d07fa72c11172;p=l2e.git

diff --git a/src/battle/Capsule.h b/src/battle/Capsule.h
index 7438492..dc2ac6e 100644
--- a/src/battle/Capsule.h
+++ b/src/battle/Capsule.h
@@ -4,14 +4,18 @@
 namespace common {
 	class Capsule;
 }
+namespace math {
+	template<class>
+	class Vector;
+}
 
 #include "AttackChoice.h"
 #include "../common/Stats.h"
-#include "../geometry/Vector.h"
 #include "../graphics/Animation.h"
-#include "../graphics/fwd.h"
 #include "../graphics/Menu.h"
 
+#include <SDL.h>
+
 namespace battle {
 
 class Capsule {
@@ -42,8 +46,8 @@ public:
 	const graphics::Animation *AttackAnimation() const;
 	const graphics::Animation *SpellAnimation() const;
 
-	geometry::Vector<int> &Position() { return position; }
-	const geometry::Vector<int> &Position() const { return position; }
+	math::Vector<int> &Position() { return position; }
+	const math::Vector<int> &Position() const { return position; }
 
 	AttackChoice &GetAttackChoice() { return attackChoice; }
 	const AttackChoice &GetAttackChoice() const { return attackChoice; }
@@ -54,7 +58,7 @@ private:
 	int health;
 
 	graphics::AnimationRunner animation;
-	geometry::Vector<int> position;
+	math::Vector<int> position;
 	AttackChoice attackChoice;
 	common::Stats stats;
 
@@ -62,4 +66,4 @@ private:
 
 }
 
-#endif /* BATTLE_CAPSULE_H_ */
+#endif