X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FMap.cpp;h=3f05962a43b2e55db519f84565b362b16d748cc0;hb=2ccc2369d32fb680a3047519d79c17de34c4e10a;hp=a9e11df7e9064627cb4388b0696e78eada8c92b8;hpb=0ad5ca97b5df217329bc319d62564a9f46ba11d7;p=l2e.git

diff --git a/src/map/Map.cpp b/src/map/Map.cpp
index a9e11df..3f05962 100644
--- a/src/map/Map.cpp
+++ b/src/map/Map.cpp
@@ -11,10 +11,14 @@
 #include "Tile.h"
 #include "Trigger.h"
 #include "../graphics/Sprite.h"
+#include "../loader/TypeDescription.h"
+#include "../sdl/utility.h"
 
 #include <stdexcept>
 
 using geometry::Vector;
+using loader::FieldDescription;
+using loader::TypeDescription;
 
 namespace map {
 
@@ -122,13 +126,57 @@ void Map::RenderDebug(SDL_Surface *dest, const Vector<int> &inOffset) const {
 	}
 	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));
+		switch (triggers[i].GetType()) {
+			case Trigger::TYPE_NORTH:
+				sdl::HorizontalLine(dest, offset + (tileset->Size() / 4), tileset->Width() / 2, SDL_MapRGB(dest->format, 0x00, 0xFF, 0xFF));
+				break;
+			case Trigger::TYPE_EAST:
+				sdl::VerticalLine(dest, offset + Vector<int>(tileset->Width() * 3 / 4, tileset->Height() / 4), tileset->Height() / 2, SDL_MapRGB(dest->format, 0x00, 0xFF, 0xFF));
+				break;
+			case Trigger::TYPE_SOUTH:
+				sdl::HorizontalLine(dest, offset + Vector<int>(tileset->Width() / 4, tileset->Height() * 3 / 4), tileset->Width() / 2, SDL_MapRGB(dest->format, 0x00, 0xFF, 0xFF));
+				break;
+			case Trigger::TYPE_WEST:
+				sdl::VerticalLine(dest, offset + (tileset->Size() / 4), tileset->Width() / 2, SDL_MapRGB(dest->format, 0x00, 0xFF, 0xFF));
+				break;
+			case Trigger::TYPE_CONTACT: {
+					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));
+				}
+				break;
+		}
 	}
 }
 
+
+void Map::CreateTypeDescription() {
+	Map m;
+
+	int areaId(TypeDescription::GetTypeId("Area"));
+	int entityId(TypeDescription::GetTypeId("Entity"));
+	int imageId(TypeDescription::GetTypeId("Image"));
+	int numberId(TypeDescription::GetTypeId("Number"));
+	int spriteId(TypeDescription::GetTypeId("Sprite"));
+	int triggerId(TypeDescription::GetTypeId("Trigger"));
+
+	TypeDescription &td(TypeDescription::CreateOrGet("Map"));
+	td.SetConstructor(&Construct);
+	td.SetSize(sizeof(Map));
+
+	td.AddField("tileset", FieldDescription(((char *)&m.tileset) - ((char *)&m), spriteId).SetReferenced());
+	td.AddField("battlebg", FieldDescription(((char *)&m.battlebg) - ((char *)&m), imageId).SetReferenced());
+	td.AddField("areas", FieldDescription(((char *)&m.areas) - ((char *)&m), areaId).SetReferenced().SetAggregate());
+	td.AddField("triggers", FieldDescription(((char *)&m.triggers) - ((char *)&m), triggerId).SetReferenced().SetAggregate());
+	td.AddField("entities", FieldDescription(((char *)&m.entities) - ((char *)&m), entityId).SetReferenced().SetAggregate());
+	td.AddField("width", FieldDescription(((char *)&m.width) - ((char *)&m), numberId));
+}
+
+void Map::Construct(void *data) {
+	new (data) Map;
+}
+
 }