X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcommon%2FSpell.cpp;h=4fce398bdaf16e534c702736b1d12d101f0362f9;hb=616330670a0c3d9d4554c145e997129747d05979;hp=907034645b76373b3961340614b988cc6007bbbe;hpb=76bfe67c6f41be9c862213a3cba919e6c00955b0;p=l2e.git

diff --git a/src/common/Spell.cpp b/src/common/Spell.cpp
index 9070346..4fce398 100644
--- a/src/common/Spell.cpp
+++ b/src/common/Spell.cpp
@@ -15,25 +15,32 @@ using loader::TypeDescription;
 namespace common {
 
 Spell::Spell()
-: name(""), value(0), cost(0), usability(0) {
+: name(""), value(0), cost(0), status(false), battle(false) {
 
 }
 
 
 void Spell::CreateTypeDescription() {
 	Spell s;
-	TypeDescription &td(TypeDescription::CreateOrGet("Spell"));
-
-	td.SetSize(sizeof(Spell));
 
-	// TODO: flags
+	int boolId(TypeDescription::GetTypeId("Boolean"));
 	int numberId(TypeDescription::GetTypeId("Number"));
 	int stringId(TypeDescription::GetTypeId("String"));
 	int targetsId(TypeDescription::GetTypeId("TargetingMode"));
 
+	TypeDescription &td(TypeDescription::CreateOrGet("Spell"));
+	td.SetConstructor(&Construct);
+	td.SetSize(sizeof(Spell));
+
 	td.AddField("name", FieldDescription(((char *)&s.name) - ((char *)&s), stringId, true));
 	td.AddField("cost", FieldDescription(((char *)&s.cost) - ((char *)&s), numberId, false));
 	td.AddField("targets", FieldDescription(((char *)&s.targetingMode) - ((char *)&s), targetsId, false));
+	td.AddField("status", FieldDescription(((char *)&s.status) - ((char *)&s), boolId, false));
+	td.AddField("battle", FieldDescription(((char *)&s.battle) - ((char *)&s), boolId, false));
+}
+
+void Spell::Construct(void *data) {
+	new (data) Spell;
 }
 
 }