X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;ds=inline;f=src%2Floader%2FInterpreter.cpp;h=0c17bd56af986ea20ceb83ecab1cd43ca1db9f17;hb=9f352d64f920f46a2d5b4fe67408154629933293;hp=28e9b39335d2f13c13ecc7c0226d1ecf69589c6e;hpb=06b6411e5dc8fc6b905530f7adbde8bd0c2bb0ea;p=l2e.git

diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp
index 28e9b39..0c17bd5 100644
--- a/src/loader/Interpreter.cpp
+++ b/src/loader/Interpreter.cpp
@@ -47,7 +47,6 @@ using graphics::SimpleAnimation;
 using graphics::Sprite;
 using geometry::Vector;
 using std::make_pair;
-using std::map;
 using std::set;
 using std::string;
 using std::vector;
@@ -58,11 +57,11 @@ Interpreter::~Interpreter() {
 	for (vector<PostponedDefinition>::const_iterator i(postponedDefinitions.begin()), end(postponedDefinitions.end()); i != end; ++i) {
 		delete i->identifier;
 	}
-	for (map<string, SDL_Surface *>::const_iterator i(imageCache.begin()), end(imageCache.end()); i != end; ++i) {
+	for (std::map<string, SDL_Surface *>::const_iterator i(imageCache.begin()), end(imageCache.end()); i != end; ++i) {
 		SDL_FreeSurface(i->second);
 	}
 	// TODO: maybe need to reverse the array deletion check if most objects turn out to be arrays (of char)
-	for (map<int, vector<void *> >::const_iterator i(values.begin()), end(values.end()); i != end; ++i) {
+	for (std::map<int, vector<void *> >::const_iterator i(values.begin()), end(values.end()); i != end; ++i) {
 		for (vector<void *>::const_iterator j(i->second.begin()), end(i->second.end()); j != end; ++j) {
 			delete[] reinterpret_cast<char *>(*j);
 		}
@@ -71,16 +70,12 @@ Interpreter::~Interpreter() {
 
 
 const Interpreter::ParsedDefinition &Interpreter::GetDefinition(const string &identifier) const {
-	try {
-		return parsedDefinitions.at(identifier);
-	} catch (...) {
-		throw std::runtime_error("cannot find definition for " + identifier);
-	}
+	return parsedDefinitions.at(identifier);
 }
 
 
 void *Interpreter::GetObject(int typeId, const std::string &name) {
-	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+	std::map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
 	if (i != parsedDefinitions.end()) {
 		const TypeDescription &requested(TypeDescription::Get(typeId));
 		const TypeDescription &actual(TypeDescription::Get(i->second.type));
@@ -324,11 +319,12 @@ void Interpreter::ReadObject(int typeId, int id, char *object, const PropertyLis
 			Postpone(typeId, id, fd.Offset(), i->second->GetIdentifier(), fd.TypeId(), !fd.IsReferenced());
 		}
 	}
+	td.Load(object);
 }
 
 
 SDL_Surface *Interpreter::GetImage(const string &path) {
-	map<string, SDL_Surface *>::const_iterator result(imageCache.find(path));
+	std::map<string, SDL_Surface *>::const_iterator result(imageCache.find(path));
 	if (result != imageCache.end()) {
 		return result->second;
 	} else {