X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FInterpreter.cpp;h=28e9b39335d2f13c13ecc7c0226d1ecf69589c6e;hb=06b6411e5dc8fc6b905530f7adbde8bd0c2bb0ea;hp=42fb1216d18e207d4e20c843fd2856a0dde15bc4;hpb=46d158b25b842d2ec4b9734af09ca6006c934498;p=l2e.git

diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp
index 42fb121..28e9b39 100644
--- a/src/loader/Interpreter.cpp
+++ b/src/loader/Interpreter.cpp
@@ -15,6 +15,7 @@
 #include "../common/Ikari.h"
 #include "../common/Item.h"
 #include "../common/Spell.h"
+#include "../common/Stats.h"
 #include "../common/TargetingMode.h"
 #include "../graphics/ComplexAnimation.h"
 #include "../graphics/Font.h"
@@ -31,10 +32,10 @@
 using battle::Hero;
 using battle::Monster;
 using battle::PartyLayout;
-using battle::Stats;
 using common::Ikari;
 using common::Item;
 using common::Spell;
+using common::Stats;
 using common::TargetingMode;
 using graphics::Animation;
 using graphics::Color;
@@ -69,6 +70,15 @@ 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);
+	}
+}
+
+
 void *Interpreter::GetObject(int typeId, const std::string &name) {
 	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
 	if (i != parsedDefinitions.end()) {
@@ -107,7 +117,26 @@ void Interpreter::ReadDefinition(const Definition &dfn) {
 }
 
 void Interpreter::ReadLiteral(const Definition &dfn) {
-	switch (dfn.GetLiteral()->GetType()) {
+	const string &typeName(dfn.GetLiteral()->IsArray() ? "Array" : dfn.GetLiteral()->GetTypeName());
+	int typeId(TypeDescription::GetTypeId(typeName));
+	int id(values[typeId].size());
+	const TypeDescription &td(TypeDescription::Get(typeId));
+	int size(
+			(dfn.GetLiteral()->GetType() == Literal::PATH
+					|| dfn.GetLiteral()->GetType() == Literal::STRING)
+			? dfn.GetLiteral()->GetString().size() : td.Size());
+	char *object(new char[size]);
+	if (dfn.GetLiteral()->GetType() == Literal::OBJECT) {
+		ReadObject(typeId, id, object, *dfn.GetLiteral()->GetProperties());
+	} else {
+		ReadLiteral(typeId, id, object, *dfn.GetLiteral());
+	}
+	values[typeId].push_back(object);
+	parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, typeId, id)));
+}
+
+void Interpreter::ReadLiteral(int typeId, int id, char *object, const Literal &literal) {
+	switch (literal.GetType()) {
 		case Literal::ARRAY_VALUES:
 			throw Error("named value arrays are not supported, sorry");
 			break;
@@ -115,55 +144,27 @@ void Interpreter::ReadLiteral(const Definition &dfn) {
 			throw Error("named property list arrays are not supported, sorry");
 			break;
 		case Literal::BOOLEAN:
-			{
-				int typeId(TypeDescription::GetTypeId("Boolean"));
-				values[typeId].push_back(new bool(dfn.GetLiteral()->GetBoolean()));
-				parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, typeId, values[typeId].size() - 1)));
-			}
+			new (object) bool(literal.GetBoolean());
 			break;
 		case Literal::COLOR:
-			{
-				int typeId(TypeDescription::GetTypeId("Color"));
-				values[typeId].push_back(new Color(dfn.GetLiteral()->GetRed(), dfn.GetLiteral()->GetGreen(), dfn.GetLiteral()->GetBlue(), dfn.GetLiteral()->GetAlpha()));
-				parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, typeId, values[typeId].size() - 1)));
-			}
+			new (object) Color(literal.GetRed(), literal.GetGreen(), literal.GetBlue(), literal.GetAlpha());
 			break;
 		case Literal::NUMBER:
-			{
-				int typeId(TypeDescription::GetTypeId("Number"));
-				values[typeId].push_back(new int(dfn.GetLiteral()->GetNumber()));
-				parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, typeId, values[typeId].size() - 1)));
-			}
+			new (object) int(literal.GetNumber());
 			break;
 		case Literal::PATH:
-			{
-				int typeId(TypeDescription::GetTypeId("Path"));
-				char *str(new char[dfn.GetLiteral()->GetString().size() + 1]);
-				std::memcpy(str, dfn.GetLiteral()->GetString().c_str(), dfn.GetLiteral()->GetString().size());
-				str[dfn.GetLiteral()->GetString().size()] = '\0';
-				values[typeId].push_back(str);
-				parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, typeId, values[typeId].size() - 1)));
-			}
+			std::memcpy(object, literal.GetString().c_str(), literal.GetString().size());
+			object[literal.GetString().size()] = '\0';
 			break;
 		case Literal::STRING:
-			{
-				int typeId(TypeDescription::GetTypeId("String"));
-				char *str(new char[dfn.GetLiteral()->GetString().size() + 1]);
-				std::memcpy(str, dfn.GetLiteral()->GetString().c_str(), dfn.GetLiteral()->GetString().size());
-				str[dfn.GetLiteral()->GetString().size()] = '\0';
-				values[typeId].push_back(str);
-				parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, typeId, values[typeId].size() - 1)));
-			}
+			std::memcpy(object, literal.GetString().c_str(), literal.GetString().size());
+			object[literal.GetString().size()] = '\0';
 			break;
 		case Literal::VECTOR:
-			{
-				int typeId(TypeDescription::GetTypeId("Vector"));
-				values[typeId].push_back(new Vector<int>(dfn.GetLiteral()->GetX(), dfn.GetLiteral()->GetY()));
-				parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, typeId, values[typeId].size() - 1)));
-			}
+			new (object) Vector<int>(literal.GetX(), literal.GetY());
 			break;
 		case Literal::OBJECT:
-			ReadObject(dfn);
+			throw Error("illogical branch: read literal object as non-object literal");
 			break;
 	}
 }
@@ -175,6 +176,7 @@ void *Interpreter::GetObject(int typeId, const Value &v) {
 			int typeId(TypeDescription::GetTypeId(v.GetLiteral().GetTypeName()));
 			const TypeDescription &td(TypeDescription::Get(typeId));
 			char *object(new char[td.Size()]);
+			td.Construct(object);
 			int id(values[typeId].size());
 			values[typeId].push_back(object);
 			ReadObject(typeId, id, object, *v.GetLiteral().GetProperties());
@@ -250,6 +252,7 @@ void *Interpreter::GetObject(int typeId, const Value &v) {
 						const TypeDescription &td(TypeDescription::Get(typeId));
 						id = values[typeId].size();
 						char *object(new char[td.Size()]);
+						td.Construct(object);
 						ReadObject(typeId, id, object, *v.GetLiteral().GetProperties());
 					}
 					break;
@@ -268,6 +271,7 @@ void Interpreter::ReadObject(const Definition &dfn) {
 	const TypeDescription &td(TypeDescription::Get(typeId));
 	int id(values[typeId].size());
 	char *object(new char[td.Size()]);
+	td.Construct(object);
 	values[typeId].push_back(object);
 	ReadObject(typeId, id, object, *dfn.GetProperties());
 	parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, typeId, id)));
@@ -282,15 +286,21 @@ void Interpreter::ReadObject(int typeId, int id, char *object, const PropertyLis
 		if (CanLink(*i->second)) {
 			char *dest(object + fd.Offset());
 			if (fd.IsAggregate()) {
-				if (i->second->GetLiteral().GetType() != Literal::ARRAY_PROPS) {
-					throw Error("unsupported aggregate type");
-				}
 				int arraySize(i->second->GetLiteral().ArraySize());
 				char *aggregate(new char[fieldType.Size() * arraySize]);
 				char *iter(aggregate);
-				vector<PropertyList *> list(i->second->GetLiteral().GetPropertyLists());
-				for (vector<PropertyList *>::const_iterator j(list.begin()), end(list.end()); j != end; ++j, iter += fieldType.Size()) {
-					ReadObject(fieldType.TypeId(), -1, iter, **j);
+				if (i->second->GetLiteral().GetType() == Literal::ARRAY_PROPS) {
+					const vector<PropertyList *> &list(i->second->GetLiteral().GetPropertyLists());
+					for (vector<PropertyList *>::const_iterator j(list.begin()), end(list.end()); j != end; ++j, iter += fieldType.Size()) {
+						fieldType.Construct(iter);
+						ReadObject(fieldType.TypeId(), -1, iter, **j);
+					}
+				} else {
+					const vector<Value *> &list(i->second->GetLiteral().GetValues());
+					for (vector<Value *>::const_iterator j(list.begin()), end(list.end()); j != end; ++j, iter += fieldType.Size()) {
+						fieldType.Construct(iter);
+						ReadLiteral(fieldType.TypeId(), -1, iter, (*j)->GetLiteral());
+					}
 				}
 				if (fd.IsReferenced()) {
 					std::memcpy(dest, &aggregate, sizeof(char *));
@@ -301,6 +311,9 @@ void Interpreter::ReadObject(int typeId, int id, char *object, const PropertyLis
 				}
 			} else {
 				char *src(reinterpret_cast<char *>(GetObject(fd.TypeId(), *i->second)));
+				if (fd.TypeId() == TypeDescription::GetTypeId("Image")) {
+					src = reinterpret_cast<char *>(GetImage(src));
+				}
 				if (fd.IsReferenced()) {
 					std::memcpy(dest, &src, sizeof(char *));
 				} else {
@@ -308,21 +321,33 @@ void Interpreter::ReadObject(int typeId, int id, char *object, const PropertyLis
 				}
 			}
 		} else {
-			Postpone(typeId, id, fd.Offset(), i->second->GetIdentifier(), fd.TypeId());
+			Postpone(typeId, id, fd.Offset(), i->second->GetIdentifier(), fd.TypeId(), !fd.IsReferenced());
 		}
 	}
 }
 
 
+SDL_Surface *Interpreter::GetImage(const string &path) {
+	map<string, SDL_Surface *>::const_iterator result(imageCache.find(path));
+	if (result != imageCache.end()) {
+		return result->second;
+	} else {
+		SDL_Surface *image(IMG_Load(path.c_str()));
+		imageCache.insert(make_pair(path, image));
+		return image;
+	}
+}
+
+
 bool Interpreter::CanLink(const Value &v) const {
 	return v.IsLiteral() || source.IsDefined(v.GetIdentifier());
 }
 
-void Interpreter::Postpone(int type, int id, std::ptrdiff_t offset, const std::string &identifier, int linkedType) {
+void Interpreter::Postpone(int type, int id, std::ptrdiff_t offset, const std::string &identifier, int linkedType, bool inlined) {
 	char *str(new char[identifier.size() + 1]);
 	std::memcpy(str, identifier.c_str(), identifier.size());
 	str[identifier.size()] = '\0';
-	postponedDefinitions.push_back(PostponedDefinition(type, id, offset, str, linkedType));
+	postponedDefinitions.push_back(PostponedDefinition(type, id, offset, str, linkedType, inlined));
 }