X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FTrigger.h;h=024b1f210e57b8714d7a67751951ef207d2fd64a;hb=c49d46cbfbd7720627af2414e94963850fe8eed6;hp=eb174607d00e76a04c4cd8b68201f3da1ff097c9;hpb=7c43158af1abf38fa896a442cb3c6d8a5bc630e7;p=l2e.git diff --git a/src/map/Trigger.h b/src/map/Trigger.h index eb17460..024b1f2 100644 --- a/src/map/Trigger.h +++ b/src/map/Trigger.h @@ -1,22 +1,18 @@ -/* - * Trigger.h - * - * Created on: Oct 3, 2012 - * Author: holy - */ - #ifndef MAP_TRIGGER_H_ #define MAP_TRIGGER_H_ #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() { } @@ -30,7 +26,7 @@ public: }; public: - const geometry::Vector &TilePosition() const { return tilePosition; } + const math::Vector &TilePosition() const { return tilePosition; } Type GetType() const { return Type(type); } bool HasScript() const { return script; } common::Script &GetScript() { return *script; } @@ -41,13 +37,13 @@ public: // temporary setters public: - void SetTilePosition(const geometry::Vector &p) { tilePosition = p; } + void SetTilePosition(const math::Vector &p) { tilePosition = p; } void SetType(Type t) { type = t; } void SetScript(common::Script *s) { script = s; } private: common::Script *script; - geometry::Vector tilePosition; + math::Vector tilePosition; int type; };