X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMapState.h;h=5bbd6f856648c25bf062e2e015cf50fe2db71aeb;hb=06db9f596cd1c5aa4c0832b387882f7c74c1b4c0;hp=af66d241d40b6efe4a5a312e2b31f8735ff84559;hpb=cc3d698b8c1ad09d7a3f9e3f28bc84e0ac1735ea;p=l2e.git diff --git a/src/map/MapState.h b/src/map/MapState.h index af66d24..5bbd6f8 100644 --- a/src/map/MapState.h +++ b/src/map/MapState.h @@ -7,7 +7,7 @@ #include "../common/fwd.h" #include "../common/ScriptHost.h" #include "../common/ScriptRunner.h" -#include "../geometry/Vector.h" +#include "../math/Vector.h" #include "../graphics/Camera.h" #include @@ -34,7 +34,7 @@ public: void SetWalkingSpeed(float s) { walkingSpeed = s; } - void Transition(Map *, const geometry::Vector &coordinates); + void Transition(Map *, const math::Vector &coordinates); virtual void HandleSyscall(common::ScriptRunner &); @@ -53,7 +53,7 @@ private: void LoadMap(Map *); bool CheckBlocking(); - bool CheckBlocking(const geometry::Vector &position, Entity::Orientation direction) const; + bool CheckBlocking(const math::Vector &position, Entity::Orientation direction) const; void OnTileLock(); bool OnGridLock(); @@ -81,7 +81,7 @@ private: Entity *pushed; common::ScriptRunner runner; app::Timer moveTimer; - geometry::Vector lastLock; + math::Vector lastLock; graphics::Camera camera; std::vector entities; float walkingSpeed;