X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.h;h=ccdb51e7fef0c07477640387a4e828f7dcf182ee;hb=d8d0982340fc10e5161251a4b50223fabc7b4431;hp=f4da5ce839e0d4c1c98692df38be7f703f65e1b7;hpb=0fc36d261ef8129debbd4aa15594bc46cb82eb27;p=l2e.git diff --git a/src/map/MapState.h b/src/map/MapState.h index f4da5ce..ccdb51e 100644 --- a/src/map/MapState.h +++ b/src/map/MapState.h @@ -42,8 +42,13 @@ public: void SetWalkingSpeed(float s) { walkingSpeed = s; } + void Transition(Map *, const geometry::Vector &coordinates); + private: static bool ZCompare(const Entity *lhs, const Entity *rhs); + + bool CheckBlocking() const; + void OnTileLock(); void OnGridLock(); void OnMove(bool); @@ -52,6 +57,8 @@ private: void StopFollowers(Entity &); void LockEntities(); + void CheckMonster(); + void CheckTrigger(); private: Map *map; @@ -64,6 +71,8 @@ private: float walkingSpeed; int nextDirection; bool afterLock; + bool skipLock; + bool debug; };