X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FHero.h;h=c15c2dcbc08bf4d25cc73f7b0734b54ef4463760;hb=b02da898c7c8a08141df4e797774a61cf5e0163f;hp=fd90a1bb175b9e879e791111e3bd68e3d594f9d4;hpb=e3a38cbb756b2f0b77afcf91bf2a397bb1677bce;p=l2e.git

diff --git a/src/battle/Hero.h b/src/battle/Hero.h
index fd90a1b..c15c2dc 100644
--- a/src/battle/Hero.h
+++ b/src/battle/Hero.h
@@ -8,8 +8,11 @@
 #ifndef BATTLE_HERO_H_
 #define BATTLE_HERO_H_
 
+#include "AttackChoice.h"
 #include "Stats.h"
+#include "../geometry/Vector.h"
 #include "../graphics/Animation.h"
+#include "../graphics/Menu.h"
 
 #include <vector>
 #include <SDL.h>
@@ -24,6 +27,8 @@ namespace graphics {
 
 namespace battle {
 
+class Resources;
+
 class Hero {
 
 public:
@@ -83,6 +88,21 @@ 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; }
+	const graphics::Menu<const common::Item *> &IkariMenu() const { return ikariMenu; }
+
+	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; }
@@ -110,6 +130,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;
@@ -127,16 +150,23 @@ private:
 
 	graphics::AnimationRunner animation;
 
+	geometry::Vector<int> position;
+
+	graphics::Menu<const common::Spell *> spellMenu;
+	graphics::Menu<const common::Item *> ikariMenu;
+
+	AttackChoice attackChoice;
+
 	// 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;
 
 };