use scripts for map triggers

[l2e.git] / src / map / MapState.h

diff --git a/src/map/MapState.h b/src/map/MapState.h
index 0ca5a847a5805ef37881ac2c519cc717720d6449..952bcee393d242cca8d73cdf793c23f5afba062e 100644 (file)
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -12,6 +12,8 @@
 #include "fwd.h"
 #include "../app/State.h"
 #include "../common/fwd.h"
+#include "../common/ScriptHost.h"
+#include "../common/ScriptRunner.h"
 #include "../geometry/Vector.h"
 #include "../graphics/Camera.h"
 
@@ -20,7 +22,8 @@
 namespace map {
 
 class MapState
-: public app::State {
+: public app::State
+, public common::ScriptHost {
 
 public:
        explicit MapState(common::GameConfig *, Map *);
@@ -45,6 +48,8 @@ public:
 
        void Transition(Map *, const geometry::Vector<int> &coordinates);
 
+       virtual void HandleSyscall(common::ScriptRunner &);
+
 private:
        static bool ZCompare(const Entity *lhs, const Entity *rhs);
 
@@ -63,7 +68,15 @@ private:
 
        void LockEntities();
        bool CheckMonster();
-       bool CheckTrigger();
+
+       bool CheckLockTrigger();
+       bool CheckMoveTrigger();
+       void RunTrigger(Trigger &);
+
+       enum Syscalls {
+               TRANSITION = 1,
+               WARP = 2,
+       };
 
 private:
        common::GameConfig *game;
@@ -71,6 +84,7 @@ private:
        Map *map;
        Entity *controlled;
        Entity *pushed;
+       common::ScriptRunner runner;
        app::Timer<float> moveTimer;
        geometry::Vector<int> lastLock;
        graphics::Camera camera;