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

diff --git a/src/battle/Monster.h b/src/battle/Monster.h
index 0891a2d..3497c04 100644
--- a/src/battle/Monster.h
+++ b/src/battle/Monster.h
@@ -8,16 +8,15 @@
 #ifndef BATTLE_MONSTER_H_
 #define BATTLE_MONSTER_H_
 
+#include "AttackChoice.h"
 #include "Stats.h"
+#include "../common/fwd.h"
+#include "../geometry/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 {
@@ -60,6 +59,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 +78,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,15 +97,19 @@ private:
 
 	graphics::AnimationRunner animation;
 
-	Uint16 maxHealth, health;
-	Uint16 maxMana, mana;
+	geometry::Vector<int> position;
+
+	AttackChoice attackChoice;
+
+	int maxHealth, health;
+	int maxMana, mana;
 
 	Stats stats;
 
-	Uint16 expReward, goldReward;
+	int expReward, goldReward;
 
-	Uint8 level;
-	Uint8 dropChance;
+	int level;
+	int dropChance;
 
 };