X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FMonster.h;h=d7df41fcffc8ae8897f6d45388a024ea46ce7ff3;hb=3701b454bd2c868a886ae5287d8209b714649344;hp=e73f4e8848c0422fc7d7ed8b02ff6a304134bdf3;hpb=1907ca03c5e865c4d398170042aa384c67ffff29;p=l2e.git

diff --git a/src/battle/Monster.h b/src/battle/Monster.h
index e73f4e8..d7df41f 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>
 
@@ -62,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:
@@ -100,7 +99,7 @@ private:
 
 	graphics::AnimationRunner animation;
 
-	geometry::Vector<int> position;
+	math::Vector<int> position;
 
 	AttackChoice attackChoice;
 
@@ -118,4 +117,4 @@ private:
 
 }
 
-#endif /* BATTLE_MONSTER_H_ */
+#endif