added map transition state

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

diff --git a/src/battle/Monster.h b/src/battle/Monster.h
index c12567257e01a33e69d45acbb0f451c18db4609e..3497c04b4ddd184617604fb9f584c045e84e84b4 100644 (file)
--- a/src/battle/Monster.h
+++ b/src/battle/Monster.h
@@ -10,16 +10,13 @@
 
 #include "AttackChoice.h"
 #include "Stats.h"
+#include "../common/fwd.h"
 #include "../geometry/Vector.h"
 #include "../graphics/Animation.h"
+#include "../graphics/fwd.h"
 
 #include <SDL.h>
 
-namespace common { class Item; }
-namespace graphics {
-       class Sprite;
-}
-
 namespace battle {
 
 class Monster {
@@ -84,6 +81,9 @@ public:
        AttackChoice &GetAttackChoice() { return attackChoice; }
        const AttackChoice &GetAttackChoice() const { return attackChoice; }
 
+       static void CreateTypeDescription();
+       static void Construct(void *);
+
 private:
        const char *name;
        graphics::Sprite *sprite;
@@ -101,15 +101,15 @@ private:
 
        AttackChoice attackChoice;
 
-       Uint16 maxHealth, health;
-       Uint16 maxMana, mana;
+       int maxHealth, health;
+       int maxMana, mana;
 
        Stats stats;
 
-       Uint16 expReward, goldReward;
+       int expReward, goldReward;
 
-       Uint8 level;
-       Uint8 dropChance;
+       int level;
+       int dropChance;
 
 };