X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FMonster.h;h=db37dfebe0d0bb00873309387168f5b80a408399;hb=b02da898c7c8a08141df4e797774a61cf5e0163f;hp=0891a2d246c5f4451518e1312ba990317a5cdcf1;hpb=e3a38cbb756b2f0b77afcf91bf2a397bb1677bce;p=l2e.git

diff --git a/src/battle/Monster.h b/src/battle/Monster.h
index 0891a2d..db37dfe 100644
--- 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/Vector.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::Vector<int> &Position() { return position; }
+	const geometry::Vector<int> &Position() const { return position; }
+
 // temporary setters until loader is implemented
 public:
 	void SetName(const char *n) { name = n; }
@@ -76,6 +81,12 @@ 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; }
+
+	static void CreateTypeDescription();
+	static void Construct(void *);
+
 private:
 	const char *name;
 	graphics::Sprite *sprite;
@@ -89,6 +100,10 @@ private:
 
 	graphics::AnimationRunner animation;
 
+	geometry::Vector<int> position;
+
+	AttackChoice attackChoice;
+
 	Uint16 maxHealth, health;
 	Uint16 maxMana, mana;