[Scummvm-git-logs] scummvm master -> 927df2ceae64f86c328419d89b428a8efd55e560

[sev-]

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

Summary:
67624c25e2 DIRECTOR: LINGO: Filter script patches by platform, add more debug output
927df2ceae DIRECTOR: LINGO: Added patch for warlock shared cast run by the buildbot


Commit: 67624c25e2f99721b5df67b6079630c83897d597
    https://github.com/scummvm/scummvm/commit/67624c25e2f99721b5df67b6079630c83897d597
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-24T00:42:14+02:00

Commit Message:
DIRECTOR: LINGO: Filter script patches by platform, add more debug output

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


diff --git a/engines/director/lingo/lingo-patcher.cpp b/engines/director/lingo/lingo-patcher.cpp
index 3a891e8a6b..ea7b302833 100644
--- a/engines/director/lingo/lingo-patcher.cpp
+++ b/engines/director/lingo/lingo-patcher.cpp
@@ -94,7 +94,7 @@ Common::String Lingo::patchLingoCode(Common::String &line, LingoArchive *archive
 	// So far, we have not many patches, so do linear lookup
 	while (patch->gameId) {
 		// First, we do cheap comparisons
-		if (patch->type != type || patch->id != id || patch->linenum != linenum) {
+		if (patch->type != type || patch->id != id || patch->linenum != linenum || patch->platform != _vm->getPlatform()) {
 			patch++;
 			continue;
 		}
@@ -114,7 +114,7 @@ Common::String Lingo::patchLingoCode(Common::String &line, LingoArchive *archive
 		}
 
 		// Now everything matched
-		debugC(1, kDebugParse, "Lingo::patchLingoCode(): Applied a patch for '%s', '%s' %s:%d @ %d. \"%s\" -> \"%s\"",
+		debugC(1, kDebugParse | kDebugPreprocess, "Lingo::patchLingoCode(): Applied a patch for '%s', '%s' %s:%d @ %d. \"%s\" -> \"%s\"",
 				patch->gameId, patch->movie, scriptType2str(type), id, linenum,
 				patch->orig, patch->replace);
 		return patch->replace;


Commit: 927df2ceae64f86c328419d89b428a8efd55e560
    https://github.com/scummvm/scummvm/commit/927df2ceae64f86c328419d89b428a8efd55e560
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-24T00:42:15+02:00

Commit Message:
DIRECTOR: LINGO: Added patch for warlock shared cast run by the buildbot

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


diff --git a/engines/director/lingo/lingo-patcher.cpp b/engines/director/lingo/lingo-patcher.cpp
index ea7b302833..8c93f73def 100644
--- a/engines/director/lingo/lingo-patcher.cpp
+++ b/engines/director/lingo/lingo-patcher.cpp
@@ -74,6 +74,10 @@ struct ScriptPatch {
 			23, "alert \"Failed Save.\" & return & \"Error message number: \" string ( filer )",
 				"alert \"Failed Save.\" & return & \"Error message number: \" & string ( filer )"},
 
+	{"warlock", kPlatformWindows, "NAV/Shared Cast", kMovieScript, 1,	// For running by the buildbot
+			23, "alert \"Failed Save.\" & return & \"Error message number: \" string ( filer )",
+				"alert \"Failed Save.\" & return & \"Error message number: \" & string ( filer )"},
+
 
 	// Unbalanced 'end if' at the end of the script
 	{"jman", kPlatformWindows, "mmm/TSA RR 06", kScoreScript, 26,