X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FHero.h;h=98cda935f4b08a27d0dbe7ccce1b960771671fe1;hb=3701b454bd2c868a886ae5287d8209b714649344;hp=1ec41406a6bb17347fc8228f423c6e7e215bca9e;hpb=1338442a6db3a706d09622188aad1cdfe183a70b;p=l2e.git

diff --git a/src/battle/Hero.h b/src/battle/Hero.h
index 1ec4140..98cda93 100644
--- a/src/battle/Hero.h
+++ b/src/battle/Hero.h
@@ -1,21 +1,18 @@
-/*
- * Hero.h
- *
- *  Created on: Aug 6, 2012
- *      Author: holy
- */
-
 #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>
@@ -54,13 +51,6 @@ public:
 	common::Stats &GetStats() { return stats; }
 	const common::Stats &GetStats() const { return stats; }
 
-	common::Item *Weapon() { return master->Equipment(common::Hero::EQUIP_WEAPON); }
-	common::Item *Armor() { return master->Equipment(common::Hero::EQUIP_ARMOR); }
-	common::Item *Shield() { return master->Equipment(common::Hero::EQUIP_SHIELD); }
-	common::Item *Helmet() { return master->Equipment(common::Hero::EQUIP_HELMET); }
-	common::Item *Ring() { return master->Equipment(common::Hero::EQUIP_RING); }
-	common::Item *Jewel() { return master->Equipment(common::Hero::EQUIP_JEWEL); }
-
 	const common::Item *Weapon() const { return master->Equipment(common::Hero::EQUIP_WEAPON); }
 	const common::Item *Armor() const { return master->Equipment(common::Hero::EQUIP_ARMOR); }
 	const common::Item *Shield() const { return master->Equipment(common::Hero::EQUIP_SHIELD); }
@@ -83,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; }
@@ -103,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;
@@ -116,4 +106,4 @@ private:
 
 }
 
-#endif /* BATTLE_HERO_H_ */
+#endif