[Scummvm-git-logs] scummvm master -> 05110201d59aa267da2575f975f5e781832f1f45

[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:
05110201d5 DIRECTOR: Fix warlock-mac script patch


Commit: 05110201d59aa267da2575f975f5e781832f1f45
    https://github.com/scummvm/scummvm/commit/05110201d59aa267da2575f975f5e781832f1f45
Author: djsrv (dservilla at gmail.com)
Date: 2020-08-05T11:44:42-04:00

Commit Message:
DIRECTOR: Fix warlock-mac script patch

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 4d2538c0ff..718cf7705d 100644
--- a/engines/director/lingo/lingo-patcher.cpp
+++ b/engines/director/lingo/lingo-patcher.cpp
@@ -127,11 +127,11 @@ struct ScriptPatch {
 			5, "end if", ""},
 
 	// Missing '&'
-	{"warlock", "", kPlatformUnknown, "NAV/Shared Cast", kMovieScript, 0,
+	{"warlock", nullptr, 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", "", kPlatformUnknown, "NAV/Shared Cast", kMovieScript, 1,	// For running by the buildbot
+	{"warlock", nullptr, 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 )"},
 
@@ -162,6 +162,7 @@ Common::String Lingo::patchLingoCode(Common::String &line, LingoArchive *archive
 		}
 
 		// Now expensive ones
+		warning("EXTRA: %s", _vm->getExtra());
 		if (movie.compareToIgnoreCase(patch->movie) || strcmp(patch->gameId, _vm->getGameId())
 				|| (patch->extra && strcmp(patch->extra, _vm->getExtra()))) {
 			patch++;