X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FEntity.cpp;h=fd2cc686787d3474054462be551812ffe9f07ee8;hb=06db9f596cd1c5aa4c0832b387882f7c74c1b4c0;hp=b9261a2ae8df1aa2dc985876de00baed3d483491;hpb=1907ca03c5e865c4d398170042aa384c67ffff29;p=l2e.git

diff --git a/src/map/Entity.cpp b/src/map/Entity.cpp
index b9261a2..fd2cc68 100644
--- a/src/map/Entity.cpp
+++ b/src/map/Entity.cpp
@@ -1,10 +1,3 @@
-/*
- * Entity.cpp
- *
- *  Created on: Sep 29, 2012
- *      Author: holy
- */
-
 #include "Entity.h"
 
 #include "../battle/Monster.h"
@@ -18,7 +11,7 @@ using battle::Monster;
 using battle::PartyLayout;
 using graphics::Animation;
 using graphics::Sprite;
-using geometry::Vector;
+using math::Vector;
 using loader::FieldDescription;
 using loader::Interpreter;
 using loader::TypeDescription;
@@ -126,7 +119,7 @@ void Entity::UpdateVelocity() {
 }
 
 
-bool Entity::TileLock(const geometry::Vector<int> &tileSize) const {
+bool Entity::TileLock(const math::Vector<int> &tileSize) const {
 	// TODO: change position to point to the top-left corner of a tile
 	Vector<int> tilePosition(position);
 	return (tilePosition.X() % tileSize.X() == 0) && (tilePosition.Y() % tileSize.Y() == 0);