X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FHero.h;h=98cda935f4b08a27d0dbe7ccce1b960771671fe1;hb=69c74684a16695cc068824129ef82ea37f1b4511;hp=bf02f0309ee5865cf2efae1735dfcabb0c6ad629;hpb=cc3d698b8c1ad09d7a3f9e3f28bc84e0ac1735ea;p=l2e.git

diff --git a/src/battle/Hero.h b/src/battle/Hero.h
index bf02f03..98cda93 100644
--- a/src/battle/Hero.h
+++ b/src/battle/Hero.h
@@ -1,14 +1,18 @@
 #ifndef BATTLE_HERO_H_
 #define BATTLE_HERO_H_
 
-#include "fwd.h"
+namespace battle {
+	struct Resources;
+}
+namespace math {
+	template<class>
+	class Vector;
+}
+
 #include "AttackChoice.h"
-#include "../common/fwd.h"
 #include "../common/Hero.h"
 #include "../common/Stats.h"
-#include "../geometry/Vector.h"
 #include "../graphics/Animation.h"
-#include "../graphics/fwd.h"
 #include "../graphics/Menu.h"
 
 #include <vector>
@@ -69,8 +73,8 @@ public:
 	const graphics::Animation *AttackAnimation() const { return master->AttackAnimation(); }
 	const graphics::Animation *SpellAnimation() const { return master->SpellAnimation(); }
 
-	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; }
 
 	graphics::Menu<const common::Spell *> &SpellMenu() { return spellMenu; }
 	const graphics::Menu<const common::Spell *> &SpellMenu() const { return spellMenu; }
@@ -89,7 +93,7 @@ private:
 
 	graphics::AnimationRunner animation;
 
-	geometry::Vector<int> position;
+	math::Vector<int> position;
 
 	graphics::Menu<const common::Spell *> spellMenu;
 	graphics::Menu<const common::Item *> ikariMenu;
@@ -102,4 +106,4 @@ private:
 
 }
 
-#endif /* BATTLE_HERO_H_ */
+#endif