X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcommon%2FSpell.cpp;h=d776f8b7139b6c8847ec5999f38a6b52903f1f02;hb=cc3d698b8c1ad09d7a3f9e3f28bc84e0ac1735ea;hp=8f8784a761ed83840f9ee6c8ad77729ca6302a68;hpb=b02da898c7c8a08141df4e797774a61cf5e0163f;p=l2e.git

diff --git a/src/common/Spell.cpp b/src/common/Spell.cpp
index 8f8784a..d776f8b 100644
--- a/src/common/Spell.cpp
+++ b/src/common/Spell.cpp
@@ -1,40 +1,46 @@
-/*
- * Spell.cpp
- *
- *  Created on: Aug 10, 2012
- *      Author: holy
- */
-
 #include "Spell.h"
 
+#include "TargetingMode.h"
+#include "../loader/Interpreter.h"
 #include "../loader/TypeDescription.h"
 
 using loader::FieldDescription;
+using loader::Interpreter;
 using loader::TypeDescription;
 
 namespace common {
 
 Spell::Spell()
-: name(""), value(0), cost(0), usability(0) {
+: name("")
+, value(0)
+, cost(0)
+, heroMask(0)
+, status(false)
+, battle(false) {
 
 }
 
 
+bool Spell::Less(const Spell *lhs, const Spell *rhs) {
+	// TODO: find out real spell sorting order
+	return lhs->Cost() < rhs->Cost();
+}
+
+
 void Spell::CreateTypeDescription() {
 	Spell s;
 
-	// TODO: flags
-	int numberId(TypeDescription::GetTypeId("Number"));
-	int stringId(TypeDescription::GetTypeId("String"));
-	int targetsId(TypeDescription::GetTypeId("TargetingMode"));
-
-	TypeDescription &td(TypeDescription::CreateOrGet("Spell"));
+	TypeDescription &td(TypeDescription::Create(TYPE_ID, "Spell"));
+	td.SetDescription("All data about a spell (soon).");
 	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("name", FieldDescription(((char *)&s.name) - ((char *)&s), Interpreter::STRING_ID).SetReferenced().SetDescription("the spell's name"));
+	td.AddField("cost", FieldDescription(((char *)&s.cost) - ((char *)&s), Interpreter::NUMBER_ID).SetDescription("amount of magic points needed and deducted for invocation"));
+	td.AddField("targets", FieldDescription(((char *)&s.targetingMode) - ((char *)&s), TargetingMode::TYPE_ID).SetDescription("how target selection is to be performed"));
+	td.AddField("heroMask", FieldDescription(((char *)&s.heroMask) - ((char *)&s), Interpreter::NUMBER_ID).SetDescription("which heroes can invoke this spell"));
+	td.AddField("status", FieldDescription(((char *)&s.status) - ((char *)&s), Interpreter::BOOLEAN_ID).SetDescription("if the spell can be used at the status screen"));
+	td.AddField("battle", FieldDescription(((char *)&s.battle) - ((char *)&s), Interpreter::BOOLEAN_ID).SetDescription("if the spell can be used in battle"));
 }
 
 void Spell::Construct(void *data) {