X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMap.cpp;h=a9e11df7e9064627cb4388b0696e78eada8c92b8;hb=978ccdf2644bc445c864dbe581ead365b238cff8;hp=20f2fa575585eebd8cc0fe070d4fafb50f2b1a00;hpb=be3b4e75c82b6e9d2b5c4300138d490ec1a4932a;p=l2e.git

diff --git a/src/map/Map.cpp b/src/map/Map.cpp
index 20f2fa5..a9e11df 100644
--- a/src/map/Map.cpp
+++ b/src/map/Map.cpp
@@ -8,6 +8,7 @@
 #include "Map.h"
 
 #include "Area.h"
+#include "Tile.h"
 #include "Trigger.h"
 #include "../graphics/Sprite.h"
 
@@ -19,31 +20,60 @@ namespace map {
 
 Map::Map()
 : tileset(0)
+, battlebg(0)
 , areas(0)
 , numAreas(0)
 , triggers(0)
 , numTriggers(0)
+, entities(0)
+, numEntities(0)
 , width(0) {
 
 }
 
 
-const Area &Map::AreaAt(const Vector<int> &offset) const {
+Area *Map::AreaAt(const Vector<int> &offset) {
 	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 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 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);
+Tile *Map::TileAt(const Vector<int> &offset) {
+	Area *area(AreaAt(offset));
+	if (area) {
+		Vector<int> tileOffset(TileCoordinates(offset) % area->Size());
+		return area->TileAt(tileOffset);
+	} else {
+		return 0;
+	}
+}
+
+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) {
@@ -57,6 +87,18 @@ Trigger *Map::TriggerAt(const geometry::Vector<int> &offset) {
 	return 0;
 }
 
+SDL_Surface *Map::BattleBackgroundAt(const geometry::Vector<int> &position) {
+	Tile *tile(TileAt(position));
+	if (tile && tile->BattleBackground()) {
+		return tile->BattleBackground();
+	}
+	Area *area(AreaAt(position));
+	if (area && area->BattleBackground()) {
+		return area->BattleBackground();
+	}
+	return battlebg;
+}
+
 Vector<int> Map::TileCoordinates(const Vector<int> &position) const {
 	return position / tileset->Size();
 }
@@ -71,4 +113,22 @@ void Map::Render(SDL_Surface *dest, const Vector<int> &inOffset) const {
 	}
 }
 
+void Map::RenderDebug(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 + Vector<int>::FromIndex(i, width) * area.Size() * tileset->Size());
+		area.RenderDebug(dest, tileset, offset);
+	}
+	for (int i(0); i < numTriggers; ++i) {
+		Vector<int> offset((triggers[i].TilePosition() * tileset->Size()) + inOffset);
+		SDL_Rect destRect;
+		destRect.x = offset.X() + (tileset->Width() / 4);
+		destRect.y = offset.Y() + (tileset->Height() / 4);
+		destRect.w = tileset->Width() / 2;
+		destRect.h = tileset->Height() / 2;
+		SDL_FillRect(dest, &destRect, SDL_MapRGB(dest->format, 0x00, 0xFF, 0xFF));
+	}
+}
+
 }