X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMap.cpp;h=fc664c1d7d4e26c0060176bf0283002abfbbe5a6;hb=9f352d64f920f46a2d5b4fe67408154629933293;hp=b87cd03cb5674a2333f3b78315d1e4c03e01cf5d;hpb=d7694cc492924fad379e8886e9e23606960717c1;p=l2e.git

diff --git a/src/map/Map.cpp b/src/map/Map.cpp
index b87cd03..fc664c1 100644
--- a/src/map/Map.cpp
+++ b/src/map/Map.cpp
@@ -23,27 +23,33 @@ Map::Map()
 , numAreas(0)
 , triggers(0)
 , numTriggers(0)
+, entities(0)
+, numEntities(0)
 , width(0) {
 
 }
 
 
-const Area &Map::AreaAt(const Vector<int> &offset) const {
+const Area *Map::AreaAt(const Vector<int> &offset) const {
 	if (numAreas > 0) {
 		Vector<int> coords(TileCoordinates(offset));
 		Vector<int> areaOffset(coords / areas[0].Size());
 		int areaIndex(areaOffset.Index(width));
 		if (areaIndex < numAreas) {
-			return areas[areaIndex];
+			return areas + areaIndex;
 		}
 	}
-	throw std::out_of_range("area offset out of bounds");
+	return 0;
 }
 
-const Tile &Map::TileAt(const Vector<int> &offset) const {
-	const Area &area(AreaAt(offset));
-	Vector<int> tileOffset(TileCoordinates(offset) % area.Size());
-	return area.TileAt(tileOffset);
+const Tile *Map::TileAt(const Vector<int> &offset) const {
+	const Area *area(AreaAt(offset));
+	if (area) {
+		Vector<int> tileOffset(TileCoordinates(offset) % area->Size());
+		return area->TileAt(tileOffset);
+	} else {
+		return 0;
+	}
 }
 
 Trigger *Map::TriggerAt(const geometry::Vector<int> &offset) {