X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMap.cpp;h=682f4f2a8a7f6a43a68cb300db0e7abf36cb2edd;hb=582d93653af512b78c21eb998c62a43c9c3b6229;hp=8ff7f18dc9802ea58bd537075bc6ae481e733f07;hpb=1907ca03c5e865c4d398170042aa384c67ffff29;p=l2e.git

diff --git a/src/map/Map.cpp b/src/map/Map.cpp
index 8ff7f18..682f4f2 100644
--- a/src/map/Map.cpp
+++ b/src/map/Map.cpp
@@ -1,10 +1,3 @@
-/*
- * Map.cpp
- *
- *  Created on: Sep 29, 2012
- *      Author: holy
- */
-
 #include "Map.h"
 
 #include "Area.h"
@@ -13,11 +6,12 @@
 #include "../graphics/Sprite.h"
 #include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
+#include "../math/Vector.h"
 #include "../sdl/utility.h"
 
 #include <stdexcept>
 
-using geometry::Vector;
+using math::Vector;
 using graphics::Sprite;
 using loader::FieldDescription;
 using loader::Interpreter;
@@ -83,7 +77,7 @@ const Tile *Map::TileAt(const Vector<int> &offset) const {
 	}
 }
 
-Trigger *Map::TriggerAt(const geometry::Vector<int> &offset) {
+Trigger *Map::TriggerAt(const math::Vector<int> &offset) {
 	// TODO: add support for multiple triggers on a tile?
 	Vector<int> coords(TileCoordinates(offset));
 	for (Trigger *i(triggers); i != triggers + numTriggers; ++i) {
@@ -94,7 +88,7 @@ Trigger *Map::TriggerAt(const geometry::Vector<int> &offset) {
 	return 0;
 }
 
-SDL_Surface *Map::BattleBackgroundAt(const geometry::Vector<int> &position) {
+SDL_Surface *Map::BattleBackgroundAt(const math::Vector<int> &position) {
 	Tile *tile(TileAt(position));
 	if (tile && tile->BattleBackground()) {
 		return tile->BattleBackground();