-/*
- * Entity.cpp
- *
- * Created on: Sep 29, 2012
- * Author: holy
- */
-
#include "Entity.h"
+#include "../battle/Monster.h"
+#include "../battle/PartyLayout.h"
+#include "../graphics/Animation.h"
+#include "../graphics/Sprite.h"
+#include "../loader/Interpreter.h"
#include "../loader/TypeDescription.h"
-using geometry::Vector;
+using battle::Monster;
+using battle::PartyLayout;
+using graphics::Animation;
+using graphics::Sprite;
+using math::Vector;
using loader::FieldDescription;
+using loader::Interpreter;
using loader::TypeDescription;
namespace map {
}
-bool Entity::TileLock(const geometry::Vector<int> &tileSize) const {
+bool Entity::TileLock(const math::Vector<int> &tileSize) const {
// TODO: change position to point to the top-left corner of a tile
Vector<int> tilePosition(position);
return (tilePosition.X() % tileSize.X() == 0) && (tilePosition.Y() % tileSize.Y() == 0);
void Entity::CreateTypeDescription() {
Entity e;
- int animationId(TypeDescription::GetTypeId("Animation"));
- int monsterId(TypeDescription::GetTypeId("Monster"));
- int partyLayoutId(TypeDescription::GetTypeId("PartyLayout"));
- int vectorId(TypeDescription::GetTypeId("Vector"));
-
- TypeDescription &td(TypeDescription::CreateOrGet("Entity"));
+ TypeDescription &td(TypeDescription::Create(TYPE_ID, "Entity"));
td.SetConstructor(&Construct);
td.SetLoader(&Load);
td.SetSize(sizeof(Entity));
- td.AddField("animation", FieldDescription(((char *)&e.animation) - ((char *)&e), animationId).SetReferenced());
- td.AddField("partyLayout", FieldDescription(((char *)&e.partyLayout) - ((char *)&e), partyLayoutId).SetReferenced());
- td.AddField("monsters", FieldDescription(((char *)&e.monsters) - ((char *)&e), monsterId).SetReferenced().SetAggregate());
- td.AddField("spriteOffset", FieldDescription(((char *)&e.spriteOffset) - ((char *)&e), vectorId));
+ td.AddField("animation", FieldDescription(((char *)&e.animation) - ((char *)&e), Animation::TYPE_ID).SetReferenced());
+ td.AddField("sprite", FieldDescription(((char *)&e.sprite) - ((char *)&e), Sprite::TYPE_ID).SetReferenced());
+ td.AddField("partyLayout", FieldDescription(((char *)&e.partyLayout) - ((char *)&e), PartyLayout::TYPE_ID).SetReferenced());
+ td.AddField("monsters", FieldDescription(((char *)&e.monsters) - ((char *)&e), Monster::TYPE_ID).SetReferenced().SetAggregate());
+ td.AddField("spriteOffset", FieldDescription(((char *)&e.spriteOffset) - ((char *)&e), Interpreter::VECTOR_ID));
+ td.AddField("position", FieldDescription(((char *)&e.tilePosition) - ((char *)&e), Interpreter::VECTOR_ID));
+ td.AddField("flags", FieldDescription(((char *)&e.flags) - ((char *)&e), Interpreter::NUMBER_ID));
}
void Entity::Construct(void *data) {