X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.h;h=f4da5ce839e0d4c1c98692df38be7f703f65e1b7;hb=0fc36d261ef8129debbd4aa15594bc46cb82eb27;hp=243325c69e5fef58ed8eff91efd03ea9d5ee758a;hpb=9302f6869530e5492c73ef6f12f9cea348e8b2a6;p=l2e.git diff --git a/src/map/MapState.h b/src/map/MapState.h index 243325c..f4da5ce 100644 --- 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,12 +44,19 @@ public: private: static bool ZCompare(const Entity *lhs, const Entity *rhs); + void OnTileLock(); void OnGridLock(); - void OnMove(); + void OnMove(bool); + + void UpdateFollower(Entity &); + void StopFollowers(Entity &); + + void LockEntities(); private: - const Map *map; + Map *map; Entity *controlled; + app::Timer moveTimer; geometry::Vector tempTarget; geometry::Vector lastLock; graphics::Camera camera;