[Scummvm-git-logs] scummvm master -> c716ded122470b2715a472f4ac1181839fbb504e

[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:
c716ded122 DIRECTOR: LINGO: Keep continuations in skipped lines


Commit: c716ded122470b2715a472f4ac1181839fbb504e
    https://github.com/scummvm/scummvm/commit/c716ded122470b2715a472f4ac1181839fbb504e
Author: djsrv (dservilla at gmail.com)
Date: 2021-07-21T21:56:51-04:00

Commit Message:
DIRECTOR: LINGO: Keep continuations in skipped lines

This should keep line numbers more consistent.

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 559261b85c..e4a25b8bf2 100644
--- a/engines/director/lingo/lingo-preprocessor.cpp
+++ b/engines/director/lingo/lingo-preprocessor.cpp
@@ -155,12 +155,15 @@ Common::U32String LingoCompiler::codePreprocessor(const Common::U32String &code,
 		res1.clear();
 
 		// Get next line
+		int continuationCount = 0;
 		while (*s && *s != '\n') { // If we see a whitespace
 			res1 += *s;
 			line += tolower(*s++);
 
-			if (*s == CONTINUATION)
+			if (*s == CONTINUATION) {
 				linenumber++;
+				continuationCount++;
+			}
 		}
 		debugC(2, kDebugParse | kDebugPreprocess, "line: '%s'", line.encode().c_str());
 
@@ -170,6 +173,9 @@ Common::U32String LingoCompiler::codePreprocessor(const Common::U32String &code,
 				defFound = true;
 			} else {
 				debugC(2, kDebugParse | kDebugPreprocess, "skipping line before first definition");
+				for (int i = 0; i < continuationCount; i++) {
+					res += CONTINUATION;
+				}
 				linenumber++;
 				if (*s)	// copy newline symbol
 					res += *s++;