X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FInterpreter.cpp;h=cb15a035185512b8127d6a1206850a46b0a6fe01;hb=092a2dd175a4001a495c84ee85211734fb928c83;hp=7dcb41e969c0de829f87ef56c67896e0c0dfc82a;hpb=cc3d698b8c1ad09d7a3f9e3f28bc84e0ac1735ea;p=l2e.git

diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp
index 7dcb41e..cb15a03 100644
--- a/src/loader/Interpreter.cpp
+++ b/src/loader/Interpreter.cpp
@@ -1,6 +1,7 @@
 #include "Interpreter.h"
 
 #include "ParsedSource.h"
+#include "TypeDescription.h"
 #include "../battle/Hero.h"
 #include "../battle/Monster.h"
 #include "../battle/PartyLayout.h"
@@ -40,7 +41,7 @@ using graphics::Gauge;
 using graphics::ComplexAnimation;
 using graphics::SimpleAnimation;
 using graphics::Sprite;
-using geometry::Vector;
+using math::Vector;
 using std::make_pair;
 using std::set;
 using std::string;
@@ -127,10 +128,9 @@ void Interpreter::ReadLiteral(const Definition &dfn) {
 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;
 		case Literal::ARRAY_PROPS:
-			throw Error("named property list arrays are not supported, sorry");
+		case Literal::ARRAY_IDENTS:
+			throw Error("named arrays are not supported, sorry");
 			break;
 		case Literal::BOOLEAN:
 			new (object) bool(literal.GetBoolean());
@@ -177,10 +177,9 @@ void *Interpreter::GetObject(int typeId, const Value &v) {
 			int typeId(0), id(0);
 			switch (v.GetLiteral().GetType()) {
 				case Literal::ARRAY_VALUES:
-					throw Error("cannot copy value arrays, sorry");
-					break;
 				case Literal::ARRAY_PROPS:
-					throw Error("cannot copy property list arrays, sorry");
+				case Literal::ARRAY_IDENTS:
+					throw Error("cannot copy arrays, sorry");
 					break;
 				case Literal::BOOLEAN:
 					{
@@ -287,20 +286,35 @@ void Interpreter::ReadObject(int typeId, int id, char *object, const PropertyLis
 			char *dest(object + fd.Offset());
 			if (fd.IsAggregate()) {
 				int arraySize(i->second->GetLiteral().ArraySize());
-				char *aggregate(alloc.Alloc(fieldType.Size() * arraySize));
-				char *iter(aggregate);
+				char *aggregate;
 				if (i->second->GetLiteral().GetType() == Literal::ARRAY_PROPS) {
+					aggregate = alloc.Alloc(fieldType.Size() * arraySize);
+					char *iter = aggregate;
 					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 {
+				} else if (i->second->GetLiteral().GetType() == Literal::ARRAY_VALUES) {
+					aggregate = alloc.Alloc(fieldType.Size() * arraySize);
+					char *iter = aggregate;
 					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());
 					}
+				} else {
+					aggregate = alloc.Alloc(sizeof(char *) * arraySize);
+					char *iter = aggregate;
+					const vector<string> &list(i->second->GetLiteral().GetIdentifiers());
+					for (vector<string>::const_iterator j(list.begin()), end(list.end()); j != end; ++j, iter += sizeof(void *)) {
+						if (source.IsDefined(*j)) {
+							*reinterpret_cast<void **>(iter)
+									= GetObject(fd.TypeId(), *j);
+						} else {
+							Postpone(typeId, id, fd.Offset() + (iter - aggregate), *j, fd.TypeId(), false);
+						}
+					}
 				}
 				if (fd.IsReferenced()) {
 					std::memcpy(dest, &aggregate, sizeof(char *));