X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FInterpreter.cpp;h=7c26aaafded4ae6ad86929521e1bc5ebc9fe3e26;hb=f3230836ca2e263e84b58ffec6645c0f77439117;hp=f616c1a394a0f803d0fee0a828b5f53abf3c32b0;hpb=d003612c783c271285c437e47f4ab671405fa402;p=l2e.git

diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp
index f616c1a..7c26aaa 100644
--- a/src/loader/Interpreter.cpp
+++ b/src/loader/Interpreter.cpp
@@ -11,6 +11,10 @@
 #include "../battle/Hero.h"
 #include "../battle/Monster.h"
 #include "../battle/PartyLayout.h"
+#include "../common/Ikari.h"
+#include "../common/Item.h"
+#include "../common/Spell.h"
+#include "../common/TargetingMode.h"
 #include "../graphics/ComplexAnimation.h"
 #include "../graphics/Font.h"
 #include "../graphics/Frame.h"
@@ -26,6 +30,10 @@ using battle::Hero;
 using battle::Monster;
 using battle::PartyLayout;
 using battle::Stats;
+using common::Ikari;
+using common::Item;
+using common::Spell;
+using common::TargetingMode;
 using graphics::Animation;
 using graphics::Font;
 using graphics::Frame;
@@ -46,9 +54,6 @@ Interpreter::~Interpreter() {
 	for (vector<ComplexAnimation *>::const_iterator i(complexAnimations.begin()), end(complexAnimations.end()); i != end; ++i) {
 		delete *i;
 	}
-	for (vector<Hero *>::const_iterator i(heroes.begin()), end(heroes.end()); i != end; ++i) {
-		delete *i;
-	}
 	for (vector<Font *>::const_iterator i(fonts.begin()), end(fonts.end()); i != end; ++i) {
 		delete *i;
 	}
@@ -58,9 +63,18 @@ Interpreter::~Interpreter() {
 	for (vector<Gauge *>::const_iterator i(gauges.begin()), end(gauges.end()); i != end; ++i) {
 		delete *i;
 	}
+	for (vector<Hero *>::const_iterator i(heroes.begin()), end(heroes.end()); i != end; ++i) {
+		delete *i;
+	}
+	for (vector<Ikari *>::const_iterator i(ikaris.begin()), end(ikaris.end()); i != end; ++i) {
+		delete *i;
+	}
 	for (vector<SDL_Surface *>::const_iterator i(images.begin()), end(images.end()); i != end; ++i) {
 		SDL_FreeSurface(*i);
 	}
+	for (vector<Item *>::const_iterator i(items.begin()), end(items.end()); i != end; ++i) {
+		delete *i;
+	}
 	for (vector<Monster *>::const_iterator i(monsters.begin()), end(monsters.end()); i != end; ++i) {
 		delete *i;
 	}
@@ -70,12 +84,18 @@ Interpreter::~Interpreter() {
 	for (vector<SimpleAnimation *>::const_iterator i(simpleAnimations.begin()), end(simpleAnimations.end()); i != end; ++i) {
 		delete *i;
 	}
+	for (vector<Spell *>::const_iterator i(spells.begin()), end(spells.end()); i != end; ++i) {
+		delete *i;
+	}
 	for (vector<Sprite *>::const_iterator i(sprites.begin()), end(sprites.end()); i != end; ++i) {
 		delete *i;
 	}
 	for (vector<const char *>::const_iterator i(strings.begin()), end(strings.end()); i != end; ++i) {
 		delete *i;
 	}
+	for (vector<TargetingMode *>::const_iterator i(targetingModes.begin()), end(targetingModes.end()); i != end; ++i) {
+		delete *i;
+	}
 }
 
 
@@ -159,6 +179,32 @@ Hero *Interpreter::GetHero(const std::string &name) {
 	}
 }
 
+Ikari *Interpreter::GetIkari(const std::string &name) {
+	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+	if (i != parsedDefinitions.end()) {
+		if (i->second.type == IKARI) {
+			return ikaris[i->second.index];
+		} else {
+			throw Error("cannot cast " + i->second.dfn->TypeName() + " to Ikari");
+		}
+	} else {
+		throw Error("access to undefined Ikari " + name);
+	}
+}
+
+Item *Interpreter::GetItem(const std::string &name) {
+	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+	if (i != parsedDefinitions.end()) {
+		if (i->second.type == ITEM) {
+			return items[i->second.index];
+		} else {
+			throw Error("cannot cast " + i->second.dfn->TypeName() + " to Item");
+		}
+	} else {
+		throw Error("access to undefined Item " + name);
+	}
+}
+
 Monster *Interpreter::GetMonster(const std::string &name) {
 	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
 	if (i != parsedDefinitions.end()) {
@@ -198,6 +244,19 @@ PartyLayout *Interpreter::GetPartyLayout(const std::string &name) {
 	}
 }
 
+Spell *Interpreter::GetSpell(const std::string &name) {
+	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+	if (i != parsedDefinitions.end()) {
+		if (i->second.type == SPELL) {
+			return spells[i->second.index];
+		} else {
+			throw Error("cannot cast " + i->second.dfn->TypeName() + " to Spell");
+		}
+	} else {
+		throw Error("access to undefined Spell " + name);
+	}
+}
+
 Sprite *Interpreter::GetSprite(const std::string &name) {
 	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
 	if (i != parsedDefinitions.end()) {
@@ -224,6 +283,19 @@ const char *Interpreter::GetString(const std::string &name) const {
 	}
 }
 
+TargetingMode *Interpreter::GetTargetingMode(const std::string &name) {
+	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+	if (i != parsedDefinitions.end()) {
+		if (i->second.type == TARGETING_MODE) {
+			return targetingModes[i->second.index];
+		} else {
+			throw Error("cannot cast " + i->second.dfn->TypeName() + " to TargetingMode");
+		}
+	} else {
+		throw Error("access to undefined TargetingMode " + name);
+	}
+}
+
 Vector<int> Interpreter::GetVector(const std::string &name) const {
 	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
 	if (i != parsedDefinitions.end()) {
@@ -356,6 +428,28 @@ Gauge *Interpreter::GetGauge(const Value &v) {
 	}
 }
 
+Hero *Interpreter::GetHero(const Value &v) {
+	if (v.IsLiteral()) {
+		Hero *h(new Hero);
+		ReadHero(*h, *v.GetLiteral().GetProperties());
+		return h;
+	} else {
+		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+		return GetHero(v.GetIdentifier());
+	}
+}
+
+Ikari *Interpreter::GetIkari(const Value &v) {
+	if (v.IsLiteral()) {
+		Ikari *i(new Ikari);
+		ReadIkari(*i, *v.GetLiteral().GetProperties());
+		return i;
+	} else {
+		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+		return GetIkari(v.GetIdentifier());
+	}
+}
+
 SDL_Surface *Interpreter::GetImage(const Value &v) {
 	const char *file(GetString(v));
 	SDL_Surface *image(IMG_Load(file));
@@ -363,6 +457,17 @@ SDL_Surface *Interpreter::GetImage(const Value &v) {
 	return image;
 }
 
+Item *Interpreter::GetItem(const Value &v) {
+	if (v.IsLiteral()) {
+		Item *i(new Item);
+		ReadItem(*i, *v.GetLiteral().GetProperties());
+		return i;
+	} else {
+		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+		return GetItem(v.GetIdentifier());
+	}
+}
+
 int Interpreter::GetNumber(const Value &v) {
 	if (v.IsLiteral()) {
 		return v.GetLiteral().GetNumber();
@@ -399,6 +504,17 @@ const vector<PropertyList *> &Interpreter::GetPropertyListArray(const Value &v)
 	}
 }
 
+Spell *Interpreter::GetSpell(const Value &v) {
+	if (v.IsLiteral()) {
+		Spell *s(new Spell);
+		ReadSpell(*s, *v.GetLiteral().GetProperties());
+		return s;
+	} else {
+		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+		return GetSpell(v.GetIdentifier());
+	}
+}
+
 Sprite *Interpreter::GetSprite(const Value &v) {
 	if (v.IsLiteral()) {
 		Sprite *s(new Sprite);
@@ -419,6 +535,17 @@ const char *Interpreter::GetString(const Value &v) {
 	}
 }
 
+TargetingMode *Interpreter::GetTargetingMode(const Value &v) {
+	if (v.IsLiteral()) {
+		TargetingMode *t(new TargetingMode);
+		ReadTargetingMode(*t, *v.GetLiteral().GetProperties());
+		return t;
+	} else {
+		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+		return GetTargetingMode(v.GetIdentifier());
+	}
+}
+
 Vector<int> Interpreter::GetVector(const Value &v) {
 	if (v.IsLiteral()) {
 		return Vector<int>(v.GetLiteral().GetX(), v.GetLiteral().GetY());
@@ -468,6 +595,18 @@ void Interpreter::ReadObject(const Definition &dfn) {
 		heroes.push_back(hero);
 		ReadHero(*hero, *dfn.GetProperties());
 		parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, HERO, index)));
+	} else if (dfn.TypeName() == "Ikari") {
+		Ikari *ikari(new Ikari);
+		int index(ikaris.size());
+		ikaris.push_back(ikari);
+		ReadIkari(*ikari, *dfn.GetProperties());
+		parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, IKARI, index)));
+	} else if (dfn.TypeName() == "Item") {
+		Item *item(new Item);
+		int index(items.size());
+		items.push_back(item);
+		ReadItem(*item, *dfn.GetProperties());
+		parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, ITEM, index)));
 	} else if (dfn.TypeName() == "Monster") {
 		Monster *monster(new Monster);
 		int index(monsters.size());
@@ -486,12 +625,24 @@ void Interpreter::ReadObject(const Definition &dfn) {
 		simpleAnimations.push_back(animation);
 		ReadSimpleAnimation(*animation, *dfn.GetProperties());
 		parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, SIMPLE_ANIMATION, index)));
+	} else if (dfn.TypeName() == "Spell") {
+		Spell *spell(new Spell);
+		int index(spells.size());
+		spells.push_back(spell);
+		ReadSpell(*spell, *dfn.GetProperties());
+		parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, SPELL, index)));
 	} else if (dfn.TypeName() == "Sprite") {
 		Sprite *sprite(new Sprite);
 		int index(sprites.size());
 		sprites.push_back(sprite);
 		ReadSprite(*sprite, *dfn.GetProperties());
 		parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, SPRITE, index)));
+	} else if (dfn.TypeName() == "TargetingMode") {
+		TargetingMode *mode(new TargetingMode);
+		int index(targetingModes.size());
+		targetingModes.push_back(mode);
+		ReadTargetingMode(*mode, *dfn.GetProperties());
+		parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, TARGETING_MODE, index)));
 	} else {
 		throw Error("unhandled object type: " + dfn.TypeName());
 	}
@@ -585,6 +736,50 @@ void Interpreter::ReadGauge(Gauge &g, const PropertyList &props) {
 	}
 }
 
+void Interpreter::ReadIkari(Ikari &ikari, const PropertyList &props) {
+	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
+		if (i->first == "name") {
+			ikari.SetName(GetString(*i->second));
+		} else if (i->first == "cost") {
+			ikari.SetCost(GetNumber(*i->second));
+		} else if (i->first == "targets") {
+			ikari.GetTargetingMode() = *GetTargetingMode(*i->second);
+		} else if (i->first == "magical") {
+			if (GetBoolean(*i->second)) {
+				ikari.SetMagical();
+			}
+		} else if (i->first == "physical") {
+			if (GetBoolean(*i->second)) {
+				ikari.SetPhysical();
+			}
+		} else {
+			throw Error("unknown Ikari property: " + i->first);
+		}
+	}
+}
+
+void Interpreter::ReadItem(Item &item, const PropertyList &props) {
+	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
+		if (i->first == "name") {
+			item.SetName(GetString(*i->second));
+		} else if (i->first == "menuicon") {
+			item.SetMenuIcon(GetSprite(*i->second));
+		} else if (i->first == "battle") {
+			if (GetBoolean(*i->second)) {
+				item.SetUsableInBattle();
+			}
+		} else if (i->first == "targets") {
+			item.GetTargetingMode() = *GetTargetingMode(*i->second);
+		} else if (i->first == "ikari") {
+			item.SetIkari(GetIkari(*i->second));
+		} else if (i->first == "attackanimation") {
+			item.SetAttackAnimation(GetAnimation(*i->second));
+		} else {
+			throw Error("unknown Item property: " + i->first);
+		}
+	}
+}
+
 void Interpreter::ReadHero(Hero &h, const PropertyList &props) {
 	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
 		if (i->first == "name") {
@@ -682,6 +877,24 @@ void Interpreter::ReadSimpleAnimation(SimpleAnimation &a, const PropertyList &pr
 	}
 }
 
+void Interpreter::ReadSpell(Spell &s, const PropertyList &props) {
+	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
+		if (i->first == "name") {
+			s.SetName(GetString(*i->second));
+		} else if (i->first == "cost") {
+			s.SetCost(GetNumber(*i->second));
+		} else if (i->first == "battle") {
+			if (GetBoolean(*i->second)) {
+				s.SetUsableInBattle();
+			}
+		} else if (i->first == "targets") {
+			s.GetTargetingMode() = *GetTargetingMode(*i->second);
+		} else {
+			throw Error("unknown Spell property: " + i->first);
+		}
+	}
+}
+
 void Interpreter::ReadSprite(Sprite &s, const PropertyList &props) {
 	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
 		if (i->first == "image") {
@@ -718,4 +931,36 @@ void Interpreter::ReadStats(Stats &s, const PropertyList &props) {
 	}
 }
 
+void Interpreter::ReadTargetingMode(TargetingMode &t, const PropertyList &props) {
+	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
+		if (i->first == "ally") {
+			if (GetBoolean(*i->second)) {
+				t.TargetAlly();
+			} else {
+				t.TargetEnemy();
+			}
+		} else if (i->first == "enemy") {
+			if (GetBoolean(*i->second)) {
+				t.TargetEnemy();
+			} else {
+				t.TargetAlly();
+			}
+		} else if (i->first == "all") {
+			if (GetBoolean(*i->second)) {
+				t.TargetAll();
+			}
+		} else if (i->first == "multiple") {
+			if (GetBoolean(*i->second)) {
+				t.TargetMultiple();
+			}
+		} else if (i->first == "single") {
+			if (GetBoolean(*i->second)) {
+				t.TargetSingle();
+			}
+		} else {
+			throw Error("unknown TargetingMode property: " + i->first);
+		}
+	}
+}
+
 }