added type description of Hero

[l2e.git] / src / battle / Hero.h

diff --git a/src/battle/Hero.h b/src/battle/Hero.h
index 74449026f93efe706ac469222d895e6194808517..122ee94112a21aac140f95a0187923dd820afef0 100644 (file)
--- a/src/battle/Hero.h
+++ b/src/battle/Hero.h
@@ -10,7 +10,7 @@
 
 #include "AttackChoice.h"
 #include "Stats.h"
-#include "../geometry/Point.h"
+#include "../geometry/Vector.h"
 #include "../graphics/Animation.h"
 #include "../graphics/Menu.h"
 
@@ -88,8 +88,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 +130,8 @@ public:
        void SetAttackAnimation(const graphics::Animation *a) { attackAnimation = a; }
        void SetSpellAnimation(const graphics::Animation *a) { spellAnimation = a; }
 
+       static void CreateTypeDescription();
+
 private:
        const char *name;
        graphics::Sprite *sprite;
@@ -147,7 +149,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 +159,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;
 
 };