X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Floader%2FInterpreter.cpp;h=12dacb89cd8ab85fe92f3b6bf9f23e0df0a8180d;hb=912fc1a30dc8ec2ab782256d32e517206c87a04c;hp=9e076c1cb68494c46ce18c54bacf41ff578312c7;hpb=05112fcfdbd0c452c80b6786bf6121d6f63b852a;p=l2e.git

diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp
index 9e076c1..12dacb8 100644
--- a/src/loader/Interpreter.cpp
+++ b/src/loader/Interpreter.cpp
@@ -14,6 +14,9 @@
 #include "../graphics/SimpleAnimation.h"
 #include "../graphics/Sprite.h"
 
+#include <algorithm>
+#include <SDL_image.h>
+
 using battle::Hero;
 using battle::Monster;
 using battle::Stats;
@@ -22,6 +25,7 @@ using graphics::ComplexAnimation;
 using graphics::SimpleAnimation;
 using graphics::Sprite;
 using geometry::Vector;
+using std::make_pair;
 using std::map;
 using std::set;
 using std::string;
@@ -29,6 +33,98 @@ using std::vector;
 
 namespace loader {
 
+Interpreter::~Interpreter() {
+	for (vector<Animation *>::const_iterator i(animations.begin()), end(animations.end()); i != end; ++i) {
+		delete *i;
+	}
+	for (vector<Hero *>::const_iterator i(heroes.begin()), end(heroes.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<Monster *>::const_iterator i(monsters.begin()), end(monsters.end()); i != end; ++i) {
+		delete *i;
+	}
+	for (vector<Sprite *>::const_iterator i(sprites.begin()), end(sprites.end()); i != end; ++i) {
+		delete *i;
+	}
+}
+
+
+bool Interpreter::ParsedDefinition::IsCompatible(DynamicType with) const {
+	return type == with
+			|| (with == ANIMATION
+					&& (type == COMPLEX_ANIMATION || type == SIMPLE_ANIMATION));
+}
+
+
+Animation *Interpreter::GetAnimation(const std::string &name) {
+	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+	if (i != parsedDefinitions.end()) {
+		if (i->second.IsCompatible(ANIMATION)) {
+			return animations[i->second.index];
+		} else {
+			throw Error("cannot cast " + i->second.dfn->TypeName() + " to Animation");
+		}
+	} else {
+		throw Error("access to undefined Animation " + name);
+	}
+}
+
+Hero *Interpreter::GetHero(const std::string &name) {
+	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+	if (i != parsedDefinitions.end()) {
+		if (i->second.IsCompatible(HERO)) {
+			return heroes[i->second.index];
+		} else {
+			throw Error("cannot cast " + i->second.dfn->TypeName() + " to Hero");
+		}
+	} else {
+		throw Error("access to undefined Hero " + name);
+	}
+}
+
+Monster *Interpreter::GetMonster(const std::string &name) {
+	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+	if (i != parsedDefinitions.end()) {
+		if (i->second.IsCompatible(MONSTER)) {
+			return monsters[i->second.index];
+		} else {
+			throw Error("cannot cast " + i->second.dfn->TypeName() + " to Monster");
+		}
+	} else {
+		throw Error("access to undefined Monster " + name);
+	}
+}
+
+int Interpreter::GetNumber(const std::string &name) const {
+	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+	if (i != parsedDefinitions.end()) {
+		if (i->second.IsCompatible(NUMBER)) {
+			return numbers[i->second.index];
+		} else {
+			throw Error("cannot cast " + i->second.dfn->TypeName() + " to Number");
+		}
+	} else {
+		throw Error("access to undefined Number " + name);
+	}
+}
+
+Sprite *Interpreter::GetSprite(const std::string &name) {
+	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+	if (i != parsedDefinitions.end()) {
+		if (i->second.IsCompatible(SPRITE)) {
+			return sprites[i->second.index];
+		} else {
+			throw Error("cannot cast " + i->second.dfn->TypeName() + " to Sprite");
+		}
+	} else {
+		throw Error("access to undefined Sprite " + name);
+	}
+}
+
+
 void Interpreter::ReadSource() {
 	for (set<string>::const_iterator i(source.Exports().begin()), end(source.Exports().end()); i != end; ++i) {
 		ReadDefinition(source.GetDefinition(*i));
@@ -61,7 +157,8 @@ void Interpreter::ReadLiteral(const Definition &dfn) {
 			throw Error("unhandled literal: color");
 			break;
 		case Literal::NUMBER:
-			numbers[dfn.Identifier()] = dfn.GetLiteral()->GetNumber();
+			numbers.push_back(dfn.GetLiteral()->GetNumber());
+			parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, NUMBER, numbers.size() - 1)));
 			break;
 		case Literal::STRING:
 			throw Error("unhandled literal: string");
@@ -80,23 +177,17 @@ Animation *Interpreter::GetAnimation(const Value &v) {
 		if (v.GetLiteral().GetTypeName() == "ComplexAnimation") {
 			ComplexAnimation *a(new ComplexAnimation);
 			ReadComplexAnimation(*a, *v.GetLiteral().GetProperties());
+			animations.push_back(a);
 			return a;
 		} else {
 			SimpleAnimation *a(new SimpleAnimation);
 			ReadSimpleAnimation(*a, *v.GetLiteral().GetProperties());
+			animations.push_back(a);
 			return a;
 		}
-	} else if (animations.count(v.GetIdentifier())) {
-		return animations[v.GetIdentifier()];
-	} else if (source.IsDefined(v.GetIdentifier())) {
-		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-		if (animations.count(v.GetIdentifier())) {
-			return animations[v.GetIdentifier()];
-		} else {
-			throw Error("cannot use " + source.GetDefinition(v.GetIdentifier()).Identifier() + " " + v.GetIdentifier() + " as animation");
-		}
 	} else {
-		throw Error("use of undefined Animation " + v.GetIdentifier());
+		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+		return GetAnimation(v.GetIdentifier());
 	}
 }
 
@@ -125,26 +216,18 @@ bool Interpreter::GetBoolean(const Value &v) {
 }
 
 SDL_Surface *Interpreter::GetImage(const Value &v) {
-	if (v.IsLiteral()) {
-		// TODO: image lookup
-		return NULL;
-	} else {
-		throw Error("identifier resolution not implemented for images");
-	}
+	const char *file(GetString(v));
+	SDL_Surface *image(IMG_Load(file));
+	images.push_back(image);
+	return image;
 }
 
 int Interpreter::GetNumber(const Value &v) {
 	if (v.IsLiteral()) {
 		return v.GetLiteral().GetNumber();
-	} else if (numbers.count(v.GetIdentifier())) {
-		return numbers[v.GetIdentifier()];
 	} else {
 		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-		if (numbers.count(v.GetIdentifier())) {
-			return numbers[v.GetIdentifier()];
-		} else {
-			throw Error("use of undefined Number " + v.GetIdentifier());
-		}
+		return GetNumber(v.GetIdentifier());
 	}
 }
 
@@ -161,15 +244,9 @@ Sprite *Interpreter::GetSprite(const Value &v) {
 		Sprite *s(new Sprite);
 		ReadSprite(*s, *v.GetLiteral().GetProperties());
 		return s;
-	} else if (sprites.count(v.GetIdentifier())) {
-		return sprites[v.GetIdentifier()];
 	} else {
 		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
-		if (sprites.count(v.GetIdentifier())) {
-			return sprites[v.GetIdentifier()];
-		} else {
-			throw Error("use of undefined Sprite " + v.GetIdentifier());
-		}
+		return GetSprite(v.GetIdentifier());
 	}
 }
 
@@ -192,19 +269,25 @@ Vector<int> Interpreter::GetVector(const Value &v) {
 
 void Interpreter::ReadObject(const Definition &dfn) {
 	if (dfn.TypeName() == "Hero") {
-		Hero *h(new Hero);
-		ReadHero(*h, *dfn.GetProperties());
-		heroes[dfn.Identifier()] = h;
+		Hero *hero(new Hero);
+		int index(heroes.size());
+		heroes.push_back(hero);
+		ReadHero(*hero, *dfn.GetProperties());
+		parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, HERO, index)));
 	} else if (dfn.TypeName() == "Monster") {
-		Monster *m(new Monster);
-		ReadMonster(*m, *dfn.GetProperties());
-		monsters[dfn.Identifier()] = m;
+		Monster *monster(new Monster);
+		int index(monsters.size());
+		monsters.push_back(monster);
+		ReadMonster(*monster, *dfn.GetProperties());
+		parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, MONSTER, index)));
 	} else if (dfn.TypeName() == "Sprite") {
-		Sprite *s(new Sprite);
-		ReadSprite(*s, *dfn.GetProperties());
-		sprites[dfn.Identifier()] = s;
+		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 {
-		throw Error("unhandled object: " + dfn.TypeName());
+		throw Error("unhandled object type: " + dfn.TypeName());
 	}
 }
 
@@ -300,6 +383,8 @@ void Interpreter::ReadMonster(Monster &m, const PropertyList &props) {
 			m.SetStats(stats);
 		} else if (i->first == "attackAnimation") {
 			m.SetAttackAnimation(GetAnimation(*i->second));
+		} else if (i->first == "meleeAnimation") {
+			m.SetMeleeAnimation(GetAnimation(*i->second));
 		} else {
 			throw Error("unknown Monster property: " + i->first);
 		}