X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FMonster.h;h=6aaf1f46164e96a182dd1b7fe1f602a4c5b2248b;hb=092a2dd175a4001a495c84ee85211734fb928c83;hp=f1073f2c8bb0e0261f1021320641c73f3f5d41b0;hpb=06b6411e5dc8fc6b905530f7adbde8bd0c2bb0ea;p=l2e.git

diff --git a/src/battle/Monster.h b/src/battle/Monster.h
index f1073f2..6aaf1f4 100644
--- a/src/battle/Monster.h
+++ b/src/battle/Monster.h
@@ -1,19 +1,18 @@
-/*
- * Monster.h
- *
- *  Created on: Aug 3, 2012
- *      Author: holy
- */
-
 #ifndef BATTLE_MONSTER_H_
 #define BATTLE_MONSTER_H_
 
+namespace common {
+	class Item;
+}
+namespace graphics {
+	class Animation;
+	class Sprite;
+}
+
 #include "AttackChoice.h"
-#include "../common/fwd.h"
 #include "../common/Stats.h"
-#include "../geometry/Vector.h"
+#include "../math/Vector.h"
 #include "../graphics/Animation.h"
-#include "../graphics/fwd.h"
 
 #include <SDL.h>
 
@@ -21,6 +20,9 @@ namespace battle {
 
 class Monster {
 
+public:
+	static const int TYPE_ID = 202;
+
 public:
 	Monster();
 	~Monster();
@@ -59,8 +61,8 @@ 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; }
+	math::Vector<int> &Position() { return position; }
+	const math::Vector<int> &Position() const { return position; }
 
 // temporary setters until loader is implemented
 public:
@@ -97,7 +99,7 @@ private:
 
 	graphics::AnimationRunner animation;
 
-	geometry::Vector<int> position;
+	math::Vector<int> position;
 
 	AttackChoice attackChoice;