X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FMonster.h;h=f1073f2c8bb0e0261f1021320641c73f3f5d41b0;hb=06b6411e5dc8fc6b905530f7adbde8bd0c2bb0ea;hp=232da8fae99bd9f705229bc5684400eb0a49b78d;hpb=8967f42789c619df6e5874f5c6a9ea4b6b6c33db;p=l2e.git

diff --git a/src/battle/Monster.h b/src/battle/Monster.h
index 232da8f..f1073f2 100644
--- a/src/battle/Monster.h
+++ b/src/battle/Monster.h
@@ -9,16 +9,14 @@
 #define BATTLE_MONSTER_H_
 
 #include "AttackChoice.h"
-#include "Stats.h"
+#include "../common/fwd.h"
+#include "../common/Stats.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 {
@@ -41,8 +39,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 +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; }
@@ -70,7 +71,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 +81,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 +97,19 @@ private:
 
 	graphics::AnimationRunner animation;
 
+	geometry::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;
 
 };