X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FTrigger.h;h=3baf74a960b8b7badf96727766782fdee5b9c237;hb=092a2dd175a4001a495c84ee85211734fb928c83;hp=13b85ac491a08a65b5264991bc6918fa2325f385;hpb=2ad47aa3758fe5d04ba1764f275a0fe30706d200;p=l2e.git

diff --git a/src/map/Trigger.h b/src/map/Trigger.h
index 13b85ac..3baf74a 100644
--- a/src/map/Trigger.h
+++ b/src/map/Trigger.h
@@ -1,22 +1,20 @@
-/*
- * 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 {
 
 class Trigger {
 
+public:
+	static const int TYPE_ID = 604;
+
 public:
 	Trigger();
 	~Trigger() { }
@@ -26,26 +24,29 @@ public:
 		TYPE_EAST = Entity::ORIENTATION_EAST,
 		TYPE_SOUTH = Entity::ORIENTATION_SOUTH,
 		TYPE_WEST = Entity::ORIENTATION_WEST,
-		TYPE_CONTACT,
+		TYPE_CONTACT = 4,
 	};
 
 public:
-	const geometry::Vector<int> &TilePosition() const { return tilePosition; }
-	Type GetType() const { return type; }
+	const math::Vector<int> &TilePosition() const { return tilePosition; }
+	Type GetType() const { return Type(type); }
 	bool HasScript() const { return script; }
 	common::Script &GetScript() { return *script; }
 	const common::Script &GetScript() const { return *script; }
 
+	static void CreateTypeDescription();
+	static void Construct(void *);
+
 // 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;
-	Type type;
+	math::Vector<int> tilePosition;
+	int type;
 
 };