X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FHero.h;h=df23aa10162e965babba702dfba38982fd195b6f;hb=e1dab8a680a76f8621e967a693dbf2b481ba8f75;hp=da2c86662de617210c982357f41bb1c00a618bad;hpb=a3ba4dc677ad7c92eeb78b20b642241563605c9d;p=l2e.git

diff --git a/src/battle/Hero.h b/src/battle/Hero.h
index da2c866..df23aa1 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 "../math/Vector.h"
 #include "../graphics/Animation.h"
-#include "../graphics/fwd.h"
 #include "../graphics/Menu.h"
 
 #include <vector>
@@ -24,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(); }
@@ -102,4 +109,4 @@ private:
 
 }
 
-#endif /* BATTLE_HERO_H_ */
+#endif