implemented followers

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

diff --git a/src/map/MapState.h b/src/map/MapState.h
index e180d4832b6b3c1aead07b2dd45cffd86896af65..f4da5ce839e0d4c1c98692df38be7f703f65e1b7 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:
@@ -40,15 +40,30 @@ public:
        void AddEntity(Entity *e) { entities.push_back(e); }
        void ControlEntity(Entity *e) { controlled = e; camera.SetTarget(&e->Position()); }
 
+       void SetWalkingSpeed(float s) { walkingSpeed = s; }
+
 private:
        static bool ZCompare(const Entity *lhs, const Entity *rhs);
+       void OnTileLock();
+       void OnGridLock();
+       void OnMove(bool);
+
+       void UpdateFollower(Entity &);
+       void StopFollowers(Entity &);
+
+       void LockEntities();
 
 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;
 
 };