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

diff --git a/src/battle/Monster.h b/src/battle/Monster.h
index 8338cb1..3497c04 100644
--- a/src/battle/Monster.h
+++ b/src/battle/Monster.h
@@ -10,16 +10,13 @@
 
 #include "AttackChoice.h"
 #include "Stats.h"
-#include "../geometry/Point.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 {
@@ -62,8 +59,8 @@ 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; }
+	geometry::Vector<int> &Position() { return position; }
+	const geometry::Vector<int> &Position() const { return position; }
 
 // temporary setters until loader is implemented
 public:
@@ -84,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;
@@ -97,19 +97,19 @@ private:
 
 	graphics::AnimationRunner animation;
 
-	geometry::Point<int> position;
+	geometry::Vector<int> position;
 
 	AttackChoice attackChoice;
 
-	Uint16 maxHealth, health;
-	Uint16 maxMana, mana;
+	int maxHealth, health;
+	int maxMana, mana;
 
 	Stats stats;
 
-	Uint16 expReward, goldReward;
+	int expReward, goldReward;
 
-	Uint8 level;
-	Uint8 dropChance;
+	int level;
+	int dropChance;
 
 };