extracted map loading/unloading

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

diff --git a/src/map/MapState.h b/src/map/MapState.h
index 34ebdd2f15fc7dd9076392aec6357fa16ea0dacc..0e49100e3b305b6e458123af8060986fd4b76958 100644 (file)
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -42,13 +42,26 @@ 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();
+       void OnMove(bool);
+
+       void UpdateFollower(Entity &);
+       void StopFollowers(Entity &);
 
-       void UpdateFollower(Entity *);
+       void LockEntities();
+       void CheckMonster();
+       void CheckTrigger();
 
 private:
        Map *map;
@@ -61,6 +74,8 @@ private:
        float walkingSpeed;
        int nextDirection;
        bool afterLock;
+       bool skipLock;
+       bool debug;
 
 };