X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.h;h=371a881e5c54cc1b363ce2269dfa58e71c16b622;hb=34e6fb59f355d1a4afc0a9a647aeb098b998dbbd;hp=2b530698ea48211fc5c08ed51e208a47bf45f4ea;hpb=c055b357c50dd871b49c38191a9d867ff42ea420;p=l2e.git diff --git a/src/map/MapState.h b/src/map/MapState.h index 2b53069..371a881 100644 --- a/src/map/MapState.h +++ b/src/map/MapState.h @@ -44,12 +44,22 @@ public: private: static bool ZCompare(const Entity *lhs, const Entity *rhs); + + bool CheckBlocking() const; + + void OnTileLock(); void OnGridLock(); - void OnMove(); + void OnMove(bool); + + void UpdateFollower(Entity &); + void StopFollowers(Entity &); + + void LockEntities(); private: Map *map; Entity *controlled; + app::Timer moveTimer; geometry::Vector tempTarget; geometry::Vector lastLock; graphics::Camera camera;