closed the gap between battle and map state (yay)

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

diff --git a/src/map/Area.cpp b/src/map/Area.cpp
index 6b3f9b186373714aa384748e7a3ba10eb8f19b22..985dea2d5462f4aae5ecba7663d6c79651f635d3 100644 (file)
--- a/src/map/Area.cpp
+++ b/src/map/Area.cpp
@@ -18,19 +18,29 @@ using geometry::Vector;
 namespace map {
 
 Area::Area()
-: tiles(0)
+: battlebg(0)
+, tiles(0)
 , numTiles(0)
 , width(0) {
 
 }
 
 
-const Tile &Area::TileAt(const geometry::Vector<int> &offset) const {
+Tile *Area::TileAt(const geometry::Vector<int> &offset) {
        int tileIndex(offset.Y() * width + offset.X());
        if (tileIndex < numTiles) {
-               return tiles[tileIndex];
+               return tiles +tileIndex;
        } else {
-               throw std::out_of_range("tile index out of range");
+               return 0;
+       }
+}
+
+const Tile *Area::TileAt(const geometry::Vector<int> &offset) const {
+       int tileIndex(offset.Y() * width + offset.X());
+       if (tileIndex < numTiles) {
+               return tiles +tileIndex;
+       } else {
+               return 0;
        }
 }