X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FHero.h;h=385962faeb0a7e7642e8e08c7d063a81227c0839;hb=e02068d51f5e7f82d4d3195e9a9ce5c9d76f727d;hp=74449026f93efe706ac469222d895e6194808517;hpb=cded7d136b41e22f363ec702f2288491c0006e3a;p=l2e.git

diff --git a/src/battle/Hero.h b/src/battle/Hero.h
index 7444902..385962f 100644
--- a/src/battle/Hero.h
+++ b/src/battle/Hero.h
@@ -8,27 +8,20 @@
 #ifndef BATTLE_HERO_H_
 #define BATTLE_HERO_H_
 
+#include "fwd.h"
 #include "AttackChoice.h"
 #include "Stats.h"
-#include "../geometry/Point.h"
+#include "../common/fwd.h"
+#include "../geometry/Vector.h"
 #include "../graphics/Animation.h"
+#include "../graphics/fwd.h"
 #include "../graphics/Menu.h"
 
 #include <vector>
 #include <SDL.h>
 
-namespace common {
-	class Item;
-	class Spell;
-}
-namespace graphics {
-	class Sprite;
-}
-
 namespace battle {
 
-class Resources;
-
 class Hero {
 
 public:
@@ -88,8 +81,8 @@ public:
 	const graphics::Animation *AttackAnimation() const { return attackAnimation; }
 	const graphics::Animation *SpellAnimation() const { return spellAnimation; }
 
-	geometry::Point<int> &Position() { return position; }
-	const geometry::Point<int> &Position() const { return position; }
+	geometry::Vector<int> &Position() { return position; }
+	const geometry::Vector<int> &Position() const { return position; }
 
 	graphics::Menu<const common::Spell *> &SpellMenu() { return spellMenu; }
 	const graphics::Menu<const common::Spell *> &SpellMenu() const { return spellMenu; }
@@ -130,6 +123,9 @@ public:
 	void SetAttackAnimation(const graphics::Animation *a) { attackAnimation = a; }
 	void SetSpellAnimation(const graphics::Animation *a) { spellAnimation = a; }
 
+	static void CreateTypeDescription();
+	static void Construct(void *);
+
 private:
 	const char *name;
 	graphics::Sprite *sprite;
@@ -147,7 +143,7 @@ private:
 
 	graphics::AnimationRunner animation;
 
-	geometry::Point<int> position;
+	geometry::Vector<int> position;
 
 	graphics::Menu<const common::Spell *> spellMenu;
 	graphics::Menu<const common::Item *> ikariMenu;
@@ -157,13 +153,13 @@ private:
 	// TODO: vector does not seem to be a good choice
 	std::vector<const common::Spell *> spells;
 
-	Uint16 maxHealth, health;
-	Uint16 maxMana, mana;
+	int maxHealth, health;
+	int maxMana, mana;
 
 	Stats stats;
 
-	Uint8 level;
-	Uint8 ip;
+	int level;
+	int ip;
 
 };