store complete entity in hero

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

diff --git a/src/map/MapState.h b/src/map/MapState.h
index f4da5ce839e0d4c1c98692df38be7f703f65e1b7..dc352f69522636e5f2248076f6cddb59bea2a804 100644 (file)
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -42,8 +42,16 @@ public:
 
        void SetWalkingSpeed(float s) { walkingSpeed = s; }
 
+       void Transition(Map *, const geometry::Vector<int> &coordinates);
+
 private:
        static bool ZCompare(const Entity *lhs, const Entity *rhs);
+
+       void UnloadMap();
+       void LoadMap(Map *);
+
+       bool CheckBlocking() const;
+
        void OnTileLock();
        void OnGridLock();
        void OnMove(bool);
@@ -52,8 +60,11 @@ private:
        void StopFollowers(Entity &);
 
        void LockEntities();
+       void CheckMonster();
+       void CheckTrigger();
 
 private:
+       app::Application *ctrl;
        Map *map;
        Entity *controlled;
        app::Timer<float> moveTimer;
@@ -64,6 +75,8 @@ private:
        float walkingSpeed;
        int nextDirection;
        bool afterLock;
+       bool skipLock;
+       bool debug;
 
 };