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

diff --git a/src/battle/Hero.h b/src/battle/Hero.h
index 275db6d..385962f 100644
--- a/src/battle/Hero.h
+++ b/src/battle/Hero.h
@@ -8,22 +8,18 @@
 #ifndef BATTLE_HERO_H_
 #define BATTLE_HERO_H_
 
+#include "fwd.h"
 #include "AttackChoice.h"
 #include "Stats.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 Hero {
@@ -85,6 +81,9 @@ public:
 	const graphics::Animation *AttackAnimation() const { return attackAnimation; }
 	const graphics::Animation *SpellAnimation() const { return spellAnimation; }
 
+	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; }
 	graphics::Menu<const common::Item *> &IkariMenu() { return ikariMenu; }
@@ -93,6 +92,10 @@ public:
 	AttackChoice &GetAttackChoice() { return attackChoice; }
 	const AttackChoice &GetAttackChoice() const { return attackChoice; }
 
+public:
+	void UpdateSpellMenu();
+	void UpdateIkariMenu(const Resources *);
+
 // temporary setters until loader is implemented
 public:
 	void SetName(const char *n) { name = n; }
@@ -120,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;
@@ -137,6 +143,8 @@ private:
 
 	graphics::AnimationRunner animation;
 
+	geometry::Vector<int> position;
+
 	graphics::Menu<const common::Spell *> spellMenu;
 	graphics::Menu<const common::Item *> ikariMenu;
 
@@ -145,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;
 
 };