X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FTrigger.h;h=086985c48a54a9bc14d20ce25a820ac462b012c5;hb=4309d259becd96ead792678257e910c03a6b4a3d;hp=d1b915e100609be5e9303e17793f865d8eb142a1;hpb=1907ca03c5e865c4d398170042aa384c67ffff29;p=l2e.git

diff --git a/src/map/Trigger.h b/src/map/Trigger.h
index d1b915e..086985c 100644
--- a/src/map/Trigger.h
+++ b/src/map/Trigger.h
@@ -1,17 +1,12 @@
-/*
- * Trigger.h
- *
- *  Created on: Oct 3, 2012
- *      Author: holy
- */
-
 #ifndef MAP_TRIGGER_H_
 #define MAP_TRIGGER_H_
 
+namespace common {
+	class Script;
+}
+
 #include "Entity.h"
-#include "fwd.h"
-#include "../common/Script.h"
-#include "../geometry/Vector.h"
+#include "../math/Vector.h"
 
 namespace map {
 
@@ -33,7 +28,7 @@ public:
 	};
 
 public:
-	const geometry::Vector<int> &TilePosition() const { return tilePosition; }
+	const math::Vector<int> &TilePosition() const { return tilePosition; }
 	Type GetType() const { return Type(type); }
 	bool HasScript() const { return script; }
 	common::Script &GetScript() { return *script; }
@@ -44,17 +39,17 @@ public:
 
 // temporary setters
 public:
-	void SetTilePosition(const geometry::Vector<int> &p) { tilePosition = p; }
+	void SetTilePosition(const math::Vector<int> &p) { tilePosition = p; }
 	void SetType(Type t) { type = t; }
 	void SetScript(common::Script *s) { script = s; }
 
 private:
 	common::Script *script;
-	geometry::Vector<int> tilePosition;
+	math::Vector<int> tilePosition;
 	int type;
 
 };
 
 }
 
-#endif /* MAP_TRIGGER_H_ */
+#endif