X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FInterpreter.cpp;fp=src%2Floader%2FInterpreter.cpp;h=bd7473aebab2a8673d4f419adbdc359efaa59e8b;hb=535f472174fd386567bec7002f645183b80cb2ef;hp=0fd2d883fba0a8129b3a896dd56d37f35e4af96f;hpb=8060b9ee74a24fe33a874732035dc8b74003439f;p=l2e.git

diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp
index 0fd2d88..bd7473a 100644
--- a/src/loader/Interpreter.cpp
+++ b/src/loader/Interpreter.cpp
@@ -343,9 +343,16 @@ void Interpreter::ReadObject(int typeId, int id, char *object, const PropertyLis
 
 
 void Interpreter::ReadScript(const std::vector<ScriptToken *> &s, Script *script) {
+	std::map<string, int> labels;
 	int size(0);
 	for (vector<ScriptToken *>::const_iterator i(s.begin()), end(s.end()); i != end; ++i) {
-		if ((*i)->GetType() != ScriptToken::COMMAND) {
+		if ((*i)->GetType() == ScriptToken::LABEL) {
+			if (labels.count((*i)->Label())) {
+				throw Error("duplicate label " + (*i)->Label());
+			} else {
+				labels[(*i)->Label()] = size;
+			}
+		} else if ((*i)->GetType() != ScriptToken::COMMAND) {
 			throw Error("unexpected script token");
 		}
 		++size;
@@ -423,6 +430,9 @@ void Interpreter::ReadScript(const std::vector<ScriptToken *> &s, Script *script
 	unsigned char *text(reinterpret_cast<unsigned char *>(alloc.Alloc(size)));
 	int cursor(0);
 	for (vector<ScriptToken *>::const_iterator i(s.begin()), end(s.end()); i != end; ++i) {
+		if ((*i)->GetType() == ScriptToken::LABEL) {
+			continue;
+		}
 		if ((*i)->GetType() != ScriptToken::COMMAND) {
 			throw Error("unexpected script token");
 		}
@@ -544,9 +554,9 @@ void Interpreter::ReadScriptAddress(const ScriptToken &t, unsigned char *dest) {
 	if (t.GetType() != ScriptToken::IDENTIFIER) {
 		throw Error("expected identifier for address");
 	}
-	if (source.IsDefined(t.GetIdentifier())) {
-		const ParsedDefinition &def(GetDefinition(t.GetIdentifier()));
-		void *addr(GetObject(def.type, t.GetIdentifier()));
+	if (source.IsDefined(t.Identifier())) {
+		const ParsedDefinition &def(GetDefinition(t.Identifier()));
+		void *addr(GetObject(def.type, t.Identifier()));
 		*reinterpret_cast<void **>(dest) = addr;
 	} else {
 		throw Error("postponing values in scripts not implemented");
@@ -555,8 +565,8 @@ void Interpreter::ReadScriptAddress(const ScriptToken &t, unsigned char *dest) {
 
 void Interpreter::ReadScriptInteger(const ScriptToken &t, unsigned char *dest) {
 	if (t.GetType() == ScriptToken::IDENTIFIER) {
-		if (source.IsDefined(t.GetIdentifier())) {
-			void *num(GetObject(TypeDescription::GetTypeId("Number"), t.GetIdentifier()));
+		if (source.IsDefined(t.Identifier())) {
+			void *num(GetObject(TypeDescription::GetTypeId("Number"), t.Identifier()));
 			*reinterpret_cast<int *>(dest) = *reinterpret_cast<int *>(num);
 		} else {
 			throw Error("postponing values in scripts not implemented");
@@ -570,8 +580,8 @@ void Interpreter::ReadScriptInteger(const ScriptToken &t, unsigned char *dest) {
 
 void Interpreter::ReadScriptVector(const ScriptToken &t, unsigned char *dest) {
 	if (t.GetType() == ScriptToken::IDENTIFIER) {
-		if (source.IsDefined(t.GetIdentifier())) {
-			void *vec(GetObject(TypeDescription::GetTypeId("Vector"), t.GetIdentifier()));
+		if (source.IsDefined(t.Identifier())) {
+			void *vec(GetObject(TypeDescription::GetTypeId("Vector"), t.Identifier()));
 			*reinterpret_cast<Vector<int> *>(dest) = *reinterpret_cast<Vector<int> *>(vec);
 		} else {
 			throw Error("postponing values in scripts not implemented");