added movement timer to track blocked movement

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

diff --git a/src/map/MapState.h b/src/map/MapState.h
index 86e2813576e3c4dddcf369c8a7783233add271d6..34ebdd2f15fc7dd9076392aec6357fa16ea0dacc 100644 (file)
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -22,7 +22,7 @@ class MapState
 : public app::State {
 
 public:
-       explicit MapState(const Map *);
+       explicit MapState(Map *);
        virtual ~MapState() { }
 
 public:
@@ -44,15 +44,23 @@ public:
 
 private:
        static bool ZCompare(const Entity *lhs, const Entity *rhs);
+       void OnTileLock();
+       void OnGridLock();
+       void OnMove();
+
+       void UpdateFollower(Entity *);
 
 private:
-       const Map *map;
+       Map *map;
        Entity *controlled;
+       app::Timer<float> moveTimer;
        geometry::Vector<float> tempTarget;
+       geometry::Vector<int> lastLock;
        graphics::Camera camera;
        std::vector<Entity *> entities;
        float walkingSpeed;
        int nextDirection;
+       bool afterLock;
 
 };