#include "Tile.h"
#include "../graphics/Sprite.h"
#include "../loader/TypeDescription.h"
+#include "../loader/Interpreter.h"
#include "../sdl/utility.h"
#include <stdexcept>
using geometry::Vector;
using loader::FieldDescription;
+using loader::Interpreter;
using loader::TypeDescription;
namespace map {
void Area::CreateTypeDescription() {
Area a;
- int imageId(TypeDescription::GetTypeId("Image"));
- int numberId(TypeDescription::GetTypeId("Number"));
- int tileId(TypeDescription::GetTypeId("Tile"));
-
- TypeDescription &td(TypeDescription::CreateOrGet("Area"));
+ TypeDescription &td(TypeDescription::Create(TYPE_ID, "Area"));
td.SetConstructor(&Construct);
td.SetSize(sizeof(Area));
- td.AddField("battlebg", FieldDescription(((char *)&a.battlebg) - ((char *)&a), imageId).SetReferenced());
- td.AddField("tiles", FieldDescription(((char *)&a.tiles) - ((char *)&a), tileId).SetReferenced().SetAggregate());
- td.AddField("width", FieldDescription(((char *)&a.width) - ((char *)&a), numberId));
+ td.AddField("battlebg", FieldDescription(((char *)&a.battlebg) - ((char *)&a), Interpreter::IMAGE_ID).SetReferenced());
+ td.AddField("tiles", FieldDescription(((char *)&a.tiles) - ((char *)&a), Tile::TYPE_ID).SetReferenced().SetAggregate());
+ td.AddField("width", FieldDescription(((char *)&a.width) - ((char *)&a), Interpreter::NUMBER_ID));
}
void Area::Construct(void *data) {