removed useless comments

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

diff --git a/src/battle/Monster.h b/src/battle/Monster.h
index c5c75caa1ad2d5bd83f4db0d52ed27a81a3d4555..d7df41fcffc8ae8897f6d45388a024ea46ce7ff3 100644 (file)
--- a/src/battle/Monster.h
+++ b/src/battle/Monster.h
@@ -1,29 +1,28 @@
-/*
- * Monster.h
- *
- *  Created on: Aug 3, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_MONSTER_H_
 #define BATTLE_MONSTER_H_
 
+namespace common {
+       class Item;
+}
+namespace graphics {
+       class Animation;
+       class Sprite;
+}
+
 #include "AttackChoice.h"
-#include "Stats.h"
-#include "../geometry/Vector.h"
+#include "../common/Stats.h"
+#include "../math/Vector.h"
 #include "../graphics/Animation.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();
@@ -42,8 +41,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; }
@@ -62,8 +61,8 @@ public:
        const graphics::Animation *AttackAnimation() const { return attackAnimation; }
        const graphics::Animation *SpellAnimation() const { return spellAnimation; }
 
-       geometry::Vector<int> &Position() { return position; }
-       const geometry::Vector<int> &Position() const { return position; }
+       math::Vector<int> &Position() { return position; }
+       const math::Vector<int> &Position() const { return position; }
 
 // temporary setters until loader is implemented
 public:
@@ -74,7 +73,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; }
@@ -85,6 +84,7 @@ public:
        const AttackChoice &GetAttackChoice() const { return attackChoice; }
 
        static void CreateTypeDescription();
+       static void Construct(void *);
 
 private:
        const char *name;
@@ -99,22 +99,22 @@ private:
 
        graphics::AnimationRunner animation;
 
-       geometry::Vector<int> position;
+       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;
 
 };
 
 }
 
-#endif /* BATTLE_MONSTER_H_ */
+#endif