handle special case of Image type objects

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

diff --git a/src/battle/Monster.h b/src/battle/Monster.h
index 8338cb18e59f8e6836c0fb6c617e280ff9f74a2f..e368dcc0e78a218b61dab47ccb2961b3146373b7 100644 (file)
--- a/src/battle/Monster.h
+++ b/src/battle/Monster.h
@@ -10,7 +10,7 @@
 
 #include "AttackChoice.h"
 #include "Stats.h"
-#include "../geometry/Point.h"
+#include "../geometry/Vector.h"
 #include "../graphics/Animation.h"
 
 #include <SDL.h>
@@ -62,8 +62,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; }
 
 // temporary setters until loader is implemented
 public:
@@ -84,6 +84,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;
@@ -97,19 +100,19 @@ private:
 
        graphics::AnimationRunner animation;
 
-       geometry::Point<int> position;
+       geometry::Vector<int> position;
 
        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;
 
 };