more Vector operations

[l2e.git] / src / map / Map.cpp

diff --git a/src/map/Map.cpp b/src/map/Map.cpp
index 10b74d079a01d43b422fa7719bb1a84298aa8d8d..20f2fa575585eebd8cc0fe070d4fafb50f2b1a00 100644 (file)
--- a/src/map/Map.cpp
+++ b/src/map/Map.cpp
@@ -31,8 +31,8 @@ Map::Map()
 const Area &Map::AreaAt(const Vector<int> &offset) const {
        if (numAreas > 0) {
                Vector<int> coords(TileCoordinates(offset));
-               Vector<int> areaOffset(coords.X() / areas[0].Width(), coords.Y() / areas[0].Height());
-               int areaIndex(areaOffset.Y() * width + areaOffset.X());
+               Vector<int> areaOffset(coords / areas[0].Size());
+               int areaIndex(areaOffset.Index(width));
                if (areaIndex < numAreas) {
                        return areas[areaIndex];
                }
@@ -42,7 +42,7 @@ const Area &Map::AreaAt(const Vector<int> &offset) const {
 
 const Tile &Map::TileAt(const Vector<int> &offset) const {
        const Area &area(AreaAt(offset));
-       Vector<int> tileOffset((offset.X() / tileset->Width()) % area.Width(), (offset.Y() / tileset->Height()) % area.Height());
+       Vector<int> tileOffset(TileCoordinates(offset) % area.Size());
        return area.TileAt(tileOffset);
 }
 
@@ -58,7 +58,7 @@ Trigger *Map::TriggerAt(const geometry::Vector<int> &offset) {
 }
 
 Vector<int> Map::TileCoordinates(const Vector<int> &position) const {
-       return Vector<int>(position.X() / tileset->Width(), position.Y() / tileset->Height());
+       return position / tileset->Size();
 }
 
 
@@ -66,9 +66,7 @@ void Map::Render(SDL_Surface *dest, const Vector<int> &inOffset) const {
        // TODO: skip invisible areas
        for (int i(0); i < numAreas; ++i) {
                const Area &area(areas[i]);
-               Vector<int> offset(
-                               inOffset.X() + (i % width) * area.Width() * tileset->Width(),
-                               inOffset.Y() + (i / width) * area.Height() * tileset->Height());
+               Vector<int> offset(inOffset + Vector<int>::FromIndex(i, width) * area.Size() * tileset->Size());
                area.Render(dest, tileset, offset);
        }
 }