renamed namespace geometry -> math

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

diff --git a/src/battle/Monster.h b/src/battle/Monster.h
index 232da8fae99bd9f705229bc5684400eb0a49b78d..bb44bb48ed2ce525b4612811ab49790f683e5868 100644 (file)
--- a/src/battle/Monster.h
+++ b/src/battle/Monster.h
@@ -1,28 +1,22 @@
-/*
- * Monster.h
- *
- *  Created on: Aug 3, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_MONSTER_H_
 #define BATTLE_MONSTER_H_
 
 #include "AttackChoice.h"
-#include "Stats.h"
+#include "../common/fwd.h"
+#include "../common/Stats.h"
+#include "../math/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 {
 
+public:
+       static const int TYPE_ID = 202;
+
 public:
        Monster();
        ~Monster();
@@ -41,8 +35,8 @@ public:
        Uint16 Mana() const { return mana; }
        int RelativeMana(int max) const { return mana * max / maxMana; }
 
-       Stats &GetStats() { return stats; }
-       const Stats &GetStats() const { return stats; }
+       common::Stats &GetStats() { return stats; }
+       const common::Stats &GetStats() const { return stats; }
 
        Uint16 ExpReward() const { return expReward; }
        Uint16 GoldReward() const { return goldReward; }
@@ -61,6 +55,9 @@ public:
        const graphics::Animation *AttackAnimation() const { return attackAnimation; }
        const graphics::Animation *SpellAnimation() const { return spellAnimation; }
 
+       math::Vector<int> &Position() { return position; }
+       const math::Vector<int> &Position() const { return position; }
+
 // temporary setters until loader is implemented
 public:
        void SetName(const char *n) { name = n; }
@@ -70,7 +67,7 @@ public:
        void SetHealth(Uint16 h) { health = h; }
        void SetMaxMana(Uint16 m) { maxMana = m; }
        void SetMana(Uint16 m) { mana = m; }
-       void SetStats(const Stats &s) { stats = s; }
+       void SetStats(const common::Stats &s) { stats = s; }
        void SetReward(Uint16 exp, Uint16 gold) { expReward = exp; goldReward = gold; }
 
        void SetMeleeAnimation(const graphics::Animation *a) { meleeAnimation = a; }
@@ -80,6 +77,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;
@@ -93,17 +93,19 @@ private:
 
        graphics::AnimationRunner animation;
 
+       math::Vector<int> position;
+
        AttackChoice attackChoice;
 
-       Uint16 maxHealth, health;
-       Uint16 maxMana, mana;
+       int maxHealth, health;
+       int maxMana, mana;
 
-       Stats stats;
+       common::Stats stats;
 
-       Uint16 expReward, goldReward;
+       int expReward, goldReward;
 
-       Uint8 level;
-       Uint8 dropChance;
+       int level;
+       int dropChance;
 
 };