removed invalid TODO :o

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

diff --git a/src/battle/Monster.h b/src/battle/Monster.h
index 0891a2d246c5f4451518e1312ba990317a5cdcf1..8338cb18e59f8e6836c0fb6c617e280ff9f74a2f 100644 (file)
--- a/src/battle/Monster.h
+++ b/src/battle/Monster.h
@@ -8,7 +8,9 @@
 #ifndef BATTLE_MONSTER_H_
 #define BATTLE_MONSTER_H_
 
+#include "AttackChoice.h"
 #include "Stats.h"
+#include "../geometry/Point.h"
 #include "../graphics/Animation.h"
 
 #include <SDL.h>
@@ -60,6 +62,9 @@ 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; }
+
 // temporary setters until loader is implemented
 public:
        void SetName(const char *n) { name = n; }
@@ -76,6 +81,9 @@ public:
        void SetAttackAnimation(const graphics::Animation *a) { attackAnimation = a; }
        void SetSpellAnimation(const graphics::Animation *a) { spellAnimation = a; }
 
+       AttackChoice &GetAttackChoice() { return attackChoice; }
+       const AttackChoice &GetAttackChoice() const { return attackChoice; }
+
 private:
        const char *name;
        graphics::Sprite *sprite;
@@ -89,6 +97,10 @@ private:
 
        graphics::AnimationRunner animation;
 
+       geometry::Point<int> position;
+
+       AttackChoice attackChoice;
+
        Uint16 maxHealth, health;
        Uint16 maxMana, mana;