[Scummvm-git-logs] scummvm master -> 35e73fe53737153ef73f434de3aea4e27dd994a1

[sev-]

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:
35e73fe537 DIRECTOR: LINGO: Add platform glob to the script patcher, and enabled it for warlock


Commit: 35e73fe53737153ef73f434de3aea4e27dd994a1
    https://github.com/scummvm/scummvm/commit/35e73fe53737153ef73f434de3aea4e27dd994a1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-29T00:34:39+02:00

Commit Message:
DIRECTOR: LINGO: Add platform glob to the script patcher, and enabled it for warlock

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 73cebae0c0..cdc16c561b 100644
--- a/engines/director/lingo/lingo-patcher.cpp
+++ b/engines/director/lingo/lingo-patcher.cpp
@@ -32,7 +32,7 @@ using namespace Common;
 
 struct ScriptPatch {
 	const char *gameId;
-	Common::Platform platform;
+	Common::Platform platform; // Specify kPlatformUnknown for skipping platform check
 	const char *movie;
 	ScriptType type;
 	uint16 id;
@@ -86,11 +86,11 @@ struct ScriptPatch {
 			5, "end if", ""},
 
 	// Missing '&'
-	{"warlock", kPlatformWindows, "NAV/Shared Cast", kMovieScript, 0,
+	{"warlock", kPlatformUnknown, "NAV/Shared Cast", kMovieScript, 0,
 			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
+	{"warlock", kPlatformUnknown, "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 )"},
 
@@ -114,7 +114,8 @@ 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 || patch->platform != _vm->getPlatform()) {
+		if (patch->type != type || patch->id != id || patch->linenum != linenum ||
+				(patch->platform != kPlatformUnknown && patch->platform != _vm->getPlatform())) {
 			patch++;
 			continue;
 		}