made TileAt/AreaAt fail silently

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

diff --git a/src/battle/Hero.h b/src/battle/Hero.h
index 1cce110df994e3af3fef811581bbc4016df6803b..385962faeb0a7e7642e8e08c7d063a81227c0839 100644 (file)
--- 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 "../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:
@@ -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;
@@ -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;
 
 };