renamed namespace geometry -> math

[l2e.git] / src / map / MapState.h

diff --git a/src/map/MapState.h b/src/map/MapState.h
index 136e1b0467eda947d968cb18ac0ea118d14057e5..5bbd6f856648c25bf062e2e015cf50fe2db71aeb 100644 (file)
--- a/src/map/MapState.h
+++ b/src/map/MapState.h
@@ -1,10 +1,3 @@
-/*
- * MapState.h
- *
- *  Created on: Sep 29, 2012
- *      Author: holy
- */
-
 #ifndef MAP_MAPSTATE_H_
 #define MAP_MAPSTATE_H_
 
@@ -14,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>
@@ -41,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 &);
 
@@ -60,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();
@@ -88,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;