[Scummvm-git-logs] scummvm master -> 8ac5130740f8771ad1bb355e7a61056e081360ba

[djsrv]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8ac5130740 DIRECTOR: LINGO: Count global and property as definitions in preprocessor


Commit: 8ac5130740f8771ad1bb355e7a61056e081360ba
    https://github.com/scummvm/scummvm/commit/8ac5130740f8771ad1bb355e7a61056e081360ba
Author: djsrv (dservilla at gmail.com)
Date: 2021-07-21T21:45:24-04:00

Commit Message:
DIRECTOR: LINGO: Count global and property as definitions in preprocessor

Changed paths:
    engines/director/lingo/lingo-preprocessor.cpp


diff --git a/engines/director/lingo/lingo-preprocessor.cpp b/engines/director/lingo/lingo-preprocessor.cpp
index f485e9b741..559261b85c 100644
--- a/engines/director/lingo/lingo-preprocessor.cpp
+++ b/engines/director/lingo/lingo-preprocessor.cpp
@@ -148,7 +148,7 @@ Common::U32String LingoCompiler::codePreprocessor(const Common::U32String &code,
 	int linenumber = 1;
 	bool defFound = false;
 
-	const Common::U32String macro("macro"), factory("factory"), on("on");
+	const Common::U32String macro("macro"), factory("factory"), on("on"), global("global"), property("property");
 
 	while (*s) {
 		line.clear();
@@ -166,7 +166,7 @@ Common::U32String LingoCompiler::codePreprocessor(const Common::U32String &code,
 
 		if (!defFound && (type == kMovieScript || type == kCastScript) && (g_director->getVersion() < 400 || g_director->getCurrentMovie()->_allowOutdatedLingo)) {
 			tok = nexttok(line.c_str());
-			if (tok.equals(macro) || tok.equals(factory) || tok.equals(on)) {
+			if (tok.equals(macro) || tok.equals(factory) || tok.equals(on) || tok.equals(global) || tok.equals(property)) {
 				defFound = true;
 			} else {
 				debugC(2, kDebugParse | kDebugPreprocess, "skipping line before first definition");