X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FCapsule.h;h=ef4e46da07f2e342d223852087684ca8b2e1d3c7;hb=087783315ac5955c17bb3b051c9351f321653df6;hp=7438492bc7f86a7046b999fc42ee4fb8e8755b18;hpb=67f6bb1d9727e7d1e2140cf2913aa89ebba84bf5;p=l2e.git

diff --git a/src/battle/Capsule.h b/src/battle/Capsule.h
index 7438492..ef4e46d 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 {
@@ -24,7 +28,7 @@ public:
 
 	const char *Name() const;
 	Uint8 Level() const;
-	const graphics::Sprite *Sprite();
+	const graphics::Sprite *Sprite() const;
 
 	Uint16 MaxHealth() const;
 	Uint16 Health() const;
@@ -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