first scripting implementation

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

diff --git a/src/map/MapState.h b/src/map/MapState.h
index a6d292b78d757b4b694e587ca29716f2e79333fd..bf19f4d5d315b0e8750d0e544588a336083f59cd 100644 (file)
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -51,7 +51,8 @@ private:
        void UnloadMap();
        void LoadMap(Map *);
 
-       bool CheckBlocking() const;
+       bool CheckBlocking();
+       bool CheckBlocking(const geometry::Vector<int> &position, Entity::Orientation direction) const;
 
        void OnTileLock();
        bool OnGridLock();
@@ -62,15 +63,18 @@ private:
 
        void LockEntities();
        bool CheckMonster();
-       bool CheckTrigger();
+
+       bool CheckLockTrigger();
+       bool CheckMoveTrigger();
+       void RunTrigger(Trigger &);
 
 private:
        common::GameConfig *game;
        app::Application *ctrl;
        Map *map;
        Entity *controlled;
+       Entity *pushed;
        app::Timer<float> moveTimer;
-       geometry::Vector<float> tempTarget;
        geometry::Vector<int> lastLock;
        graphics::Camera camera;
        std::vector<Entity *> entities;
@@ -78,6 +82,7 @@ private:
        int nextDirection;
        bool afterLock;
        bool skipLock;
+       bool pushing;
        bool debug;
 
 };