removed lazy fwd headers

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

diff --git a/src/map/Map.cpp b/src/map/Map.cpp
index be39ec371f3b47ef2b59014948900ad46d831f81..682f4f2a8a7f6a43a68cb300db0e7abf36cb2edd 100644 (file)
--- a/src/map/Map.cpp
+++ b/src/map/Map.cpp
@@ -1,21 +1,21 @@
-/*
- * Map.cpp
- *
- *  Created on: Sep 29, 2012
- *      Author: holy
- */
-
 #include "Map.h"
 
 #include "Area.h"
 #include "Tile.h"
 #include "Trigger.h"
 #include "../graphics/Sprite.h"
+#include "../loader/Interpreter.h"
+#include "../loader/TypeDescription.h"
+#include "../math/Vector.h"
 #include "../sdl/utility.h"
 
 #include <stdexcept>
 
-using geometry::Vector;
+using math::Vector;
+using graphics::Sprite;
+using loader::FieldDescription;
+using loader::Interpreter;
+using loader::TypeDescription;
 
 namespace map {
 
@@ -77,7 +77,7 @@ const Tile *Map::TileAt(const Vector<int> &offset) const {
        }
 }
 
-Trigger *Map::TriggerAt(const geometry::Vector<int> &offset) {
+Trigger *Map::TriggerAt(const math::Vector<int> &offset) {
        // TODO: add support for multiple triggers on a tile?
        Vector<int> coords(TileCoordinates(offset));
        for (Trigger *i(triggers); i != triggers + numTriggers; ++i) {
@@ -88,7 +88,7 @@ Trigger *Map::TriggerAt(const geometry::Vector<int> &offset) {
        return 0;
 }
 
-SDL_Surface *Map::BattleBackgroundAt(const geometry::Vector<int> &position) {
+SDL_Surface *Map::BattleBackgroundAt(const math::Vector<int> &position) {
        Tile *tile(TileAt(position));
        if (tile && tile->BattleBackground()) {
                return tile->BattleBackground();
@@ -145,10 +145,28 @@ void Map::RenderDebug(SDL_Surface *dest, const Vector<int> &inOffset) const {
                                        SDL_FillRect(dest, &destRect, SDL_MapRGB(dest->format, 0x00, 0xFF, 0xFF));
                                }
                                break;
-                       case Trigger::TYPE_BUTTON:
-                               break;
                }
        }
 }
 
+
+void Map::CreateTypeDescription() {
+       Map m;
+
+       TypeDescription &td(TypeDescription::Create(TYPE_ID, "Map"));
+       td.SetConstructor(&Construct);
+       td.SetSize(sizeof(Map));
+
+       td.AddField("tileset", FieldDescription(((char *)&m.tileset) - ((char *)&m), Sprite::TYPE_ID).SetReferenced());
+       td.AddField("battlebg", FieldDescription(((char *)&m.battlebg) - ((char *)&m), Interpreter::IMAGE_ID).SetReferenced());
+       td.AddField("areas", FieldDescription(((char *)&m.areas) - ((char *)&m), Area::TYPE_ID).SetReferenced().SetAggregate());
+       td.AddField("triggers", FieldDescription(((char *)&m.triggers) - ((char *)&m), Trigger::TYPE_ID).SetReferenced().SetAggregate());
+       td.AddField("entities", FieldDescription(((char *)&m.entities) - ((char *)&m), Entity::TYPE_ID).SetReferenced().SetAggregate());
+       td.AddField("width", FieldDescription(((char *)&m.width) - ((char *)&m), Interpreter::NUMBER_ID));
+}
+
+void Map::Construct(void *data) {
+       new (data) Map;
+}
+
 }