X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FMonster.cpp;h=498a8c6094ff181d311a334c337f1d9a70cdbf06;hb=4bc70f5311dcbcca4e6b9e852bbcb19602f50eeb;hp=7408eeea09939685e186f0018cfe6fcee20235a6;hpb=c45562467a2845a9f5b6942e8bf091251f5d16d6;p=l2e.git diff --git a/src/battle/Monster.cpp b/src/battle/Monster.cpp index 7408eee..498a8c6 100644 --- a/src/battle/Monster.cpp +++ b/src/battle/Monster.cpp @@ -54,9 +54,6 @@ void Monster::SubtractHealth(int amount) { void Monster::CreateTypeDescription() { Monster m; - TypeDescription &td(TypeDescription::CreateOrGet("Monster")); - - td.SetSize(sizeof(Monster)); int animationId(TypeDescription::GetTypeId("Animation")); int numberId(TypeDescription::GetTypeId("Number")); @@ -64,19 +61,28 @@ void Monster::CreateTypeDescription() { int statsId(TypeDescription::GetTypeId("Stats")); int stringId(TypeDescription::GetTypeId("String")); - td.AddField("name", FieldDescription(((char *)&m.name) - ((char *)&m), stringId, true)); - td.AddField("sprite", FieldDescription(((char *)&m.sprite) - ((char *)&m), spriteId, true)); - td.AddField("level", FieldDescription(((char *)&m.level) - ((char *)&m), numberId, false)); + TypeDescription &td(TypeDescription::CreateOrGet("Monster")); + td.SetDescription("All data of a monster."); + td.SetConstructor(&Construct); + td.SetSize(sizeof(Monster)); + + td.AddField("name", FieldDescription(((char *)&m.name) - ((char *)&m), stringId).SetReferenced()); + td.AddField("sprite", FieldDescription(((char *)&m.sprite) - ((char *)&m), spriteId).SetReferenced()); + td.AddField("level", FieldDescription(((char *)&m.level) - ((char *)&m), numberId)); - td.AddField("maxHealth", FieldDescription(((char *)&m.maxHealth) - ((char *)&m), numberId, false)); - td.AddField("health", FieldDescription(((char *)&m.health) - ((char *)&m), numberId, false)); - td.AddField("maxMana", FieldDescription(((char *)&m.maxMana) - ((char *)&m), numberId, false)); - td.AddField("mana", FieldDescription(((char *)&m.mana) - ((char *)&m), numberId, false)); - td.AddField("stats", FieldDescription(((char *)&m.stats) - ((char *)&m), statsId, false)); + td.AddField("maxHealth", FieldDescription(((char *)&m.maxHealth) - ((char *)&m), numberId)); + td.AddField("health", FieldDescription(((char *)&m.health) - ((char *)&m), numberId)); + td.AddField("maxMana", FieldDescription(((char *)&m.maxMana) - ((char *)&m), numberId)); + td.AddField("mana", FieldDescription(((char *)&m.mana) - ((char *)&m), numberId)); + td.AddField("stats", FieldDescription(((char *)&m.stats) - ((char *)&m), statsId)); + + td.AddField("attackAnimation", FieldDescription(((char *)&m.attackAnimation) - ((char *)&m), animationId).SetReferenced()); + td.AddField("spellAnimation", FieldDescription(((char *)&m.spellAnimation) - ((char *)&m), animationId).SetReferenced()); + td.AddField("meleeAnimation", FieldDescription(((char *)&m.meleeAnimation) - ((char *)&m), animationId).SetReferenced()); +} - td.AddField("attackAnimation", FieldDescription(((char *)&m.attackAnimation) - ((char *)&m), animationId, true)); - td.AddField("spellAnimation", FieldDescription(((char *)&m.spellAnimation) - ((char *)&m), animationId, true)); - td.AddField("meleeAnimation", FieldDescription(((char *)&m.meleeAnimation) - ((char *)&m), animationId, true)); +void Monster::Construct(void *data) { + new (data) Monster; } }