X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.h;h=243325c69e5fef58ed8eff91efd03ea9d5ee758a;hb=f0da7a839b18b9860fad1c62f36003628f84b5b3;hp=e180d4832b6b3c1aead07b2dd45cffd86896af65;hpb=a550d5e73bef77a8bb98a31034dcaad83a43677a;p=l2e.git diff --git a/src/map/MapState.h b/src/map/MapState.h index e180d48..243325c 100644 --- a/src/map/MapState.h +++ b/src/map/MapState.h @@ -40,15 +40,23 @@ 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 OnGridLock(); + void OnMove(); private: const Map *map; Entity *controlled; geometry::Vector tempTarget; + geometry::Vector lastLock; graphics::Camera camera; std::vector entities; + float walkingSpeed; + int nextDirection; + bool afterLock; };