]> git.localhorst.tv Git - l2e.git/blobdiff - src/map/MapState.h
renamed namespace geometry -> math
[l2e.git] / src / map / MapState.h
index af66d241d40b6efe4a5a312e2b31f8735ff84559..5bbd6f856648c25bf062e2e015cf50fe2db71aeb 100644 (file)
@@ -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 <vector>
@@ -34,7 +34,7 @@ public:
 
        void SetWalkingSpeed(float s) { walkingSpeed = s; }
 
-       void Transition(Map *, const geometry::Vector<int> &coordinates);
+       void Transition(Map *, const math::Vector<int> &coordinates);
 
        virtual void HandleSyscall(common::ScriptRunner &);
 
@@ -53,7 +53,7 @@ private:
        void LoadMap(Map *);
 
        bool CheckBlocking();
-       bool CheckBlocking(const geometry::Vector<int> &position, Entity::Orientation direction) const;
+       bool CheckBlocking(const math::Vector<int> &position, Entity::Orientation direction) const;
 
        void OnTileLock();
        bool OnGridLock();
@@ -81,7 +81,7 @@ private:
        Entity *pushed;
        common::ScriptRunner runner;
        app::Timer<float> moveTimer;
-       geometry::Vector<int> lastLock;
+       math::Vector<int> lastLock;
        graphics::Camera camera;
        std::vector<Entity *> entities;
        float walkingSpeed;