X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FHero.h;h=df23aa10162e965babba702dfba38982fd195b6f;hb=3d69f521b593457304b282e5f23e36ab165288b6;hp=5e86f88dae783da4f8dbaf47d1666e32568fb82c;hpb=350055a7ff27c74882aff8a4d6af2014782f830b;p=l2e.git

diff --git a/src/battle/Hero.h b/src/battle/Hero.h
index 5e86f88..df23aa1 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>
@@ -31,6 +28,9 @@ public:
 	~Hero();
 
 public:
+	common::Hero &Master() { return *master; }
+	const common::Hero &Master() const { return *master; }
+
 	const char *Name() const { return master->Name(); }
 	Uint8 Level() const { return master->Level(); }
 	const graphics::Sprite *Sprite() const { return master->BattleSprite(); }
@@ -76,8 +76,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; }
@@ -96,7 +96,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;
@@ -109,4 +109,4 @@ private:
 
 }
 
-#endif /* BATTLE_HERO_H_ */
+#endif