X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMap.cpp;h=823847c92213eae625b86469ded3b80ba38a5084;hb=a3ba4dc677ad7c92eeb78b20b642241563605c9d;hp=aeec93cae8b1354a43ad61cda7144a1a13940b2e;hpb=ef2496b3cb7ce66b7f831278be66261834b732e5;p=l2e.git diff --git a/src/map/Map.cpp b/src/map/Map.cpp index aeec93c..823847c 100644 --- a/src/map/Map.cpp +++ b/src/map/Map.cpp @@ -10,7 +10,7 @@ #include -using geometry::Vector; +using math::Vector; using graphics::Sprite; using loader::FieldDescription; using loader::Interpreter; @@ -76,7 +76,7 @@ const Tile *Map::TileAt(const Vector &offset) const { } } -Trigger *Map::TriggerAt(const geometry::Vector &offset) { +Trigger *Map::TriggerAt(const math::Vector &offset) { // TODO: add support for multiple triggers on a tile? Vector coords(TileCoordinates(offset)); for (Trigger *i(triggers); i != triggers + numTriggers; ++i) { @@ -87,7 +87,7 @@ Trigger *Map::TriggerAt(const geometry::Vector &offset) { return 0; } -SDL_Surface *Map::BattleBackgroundAt(const geometry::Vector &position) { +SDL_Surface *Map::BattleBackgroundAt(const math::Vector &position) { Tile *tile(TileAt(position)); if (tile && tile->BattleBackground()) { return tile->BattleBackground();