X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmap%2FTile.cpp;h=2b7e0f23bb2a56117b63166fe572605581dca548;hb=0b11a24a8b08c49d6e4301573602fb6d01e7a8c8;hp=650bbdbc00b1397d7f9b0741c0e2f260b525569c;hpb=7c43158af1abf38fa896a442cb3c6d8a5bc630e7;p=l2e.git diff --git a/src/map/Tile.cpp b/src/map/Tile.cpp index 650bbdb..2b7e0f2 100644 --- a/src/map/Tile.cpp +++ b/src/map/Tile.cpp @@ -1,22 +1,18 @@ -/* - * Tile.cpp - * - * Created on: Sep 29, 2012 - * Author: holy - */ - #include "Tile.h" +#include "../loader/Interpreter.h" #include "../loader/TypeDescription.h" using loader::FieldDescription; +using loader::Interpreter; using loader::TypeDescription; namespace map { Tile::Tile() : battlebg(0) -, flags(0) { +, flags(0) +, frames(1) { } @@ -24,17 +20,14 @@ Tile::Tile() void Tile::CreateTypeDescription() { Tile t; - int imageId(TypeDescription::GetTypeId("Image")); - int numberId(TypeDescription::GetTypeId("Number")); - int vectorId(TypeDescription::GetTypeId("Vector")); - - TypeDescription &td(TypeDescription::CreateOrGet("Tile")); + TypeDescription &td(TypeDescription::Create(TYPE_ID, "Tile")); td.SetConstructor(&Construct); td.SetSize(sizeof(Tile)); - td.AddField("battlebg", FieldDescription(((char *)&t.battlebg) - ((char *)&t), imageId).SetReferenced()); - td.AddField("t", FieldDescription(((char *)&t.offset) - ((char *)&t), vectorId)); - td.AddField("flags", FieldDescription(((char *)&t.flags) - ((char *)&t), numberId)); + td.AddField("battlebg", FieldDescription(((char *)&t.battlebg) - ((char *)&t), Interpreter::IMAGE_ID).SetReferenced()); + td.AddField("t", FieldDescription(((char *)&t.offset) - ((char *)&t), Interpreter::VECTOR_ID)); + td.AddField("flags", FieldDescription(((char *)&t.flags) - ((char *)&t), Interpreter::NUMBER_ID)); + td.AddField("frames", FieldDescription(((char *)&t.frames) - ((char *)&t), Interpreter::NUMBER_ID)); }