[Scummvm-git-logs] scummvm master -> 00d592f6e4a2e8af15a1f1e1abcd8f736313ba27

[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:
ce15a1b6de DIRECTOR: LINGO: Relax patch requirement to .contains
00d592f6e4 DIRECTOR: LINGO: Patch malformed Lingo in jman-win


Commit: ce15a1b6dea54ef0c7341e7b6e9f269c941be041
    https://github.com/scummvm/scummvm/commit/ce15a1b6dea54ef0c7341e7b6e9f269c941be041
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-17T00:13:03+02:00

Commit Message:
DIRECTOR: LINGO: Relax patch requirement to .contains

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 5290f864d8..710b559fa4 100644
--- a/engines/director/lingo/lingo-patcher.cpp
+++ b/engines/director/lingo/lingo-patcher.cpp
@@ -93,7 +93,7 @@ Common::String Lingo::patchLingoCode(Common::String &line, ScriptType type, uint
 		}
 
 		// Now do a safeguard
-		if (line.compareToIgnoreCase(patch->orig)) {
+		if (!line.contains(patch->orig)) {
 			warning("Lingo::patchLingoCode(): Unmatched patch for '%s', '%s' %s:%d @ %d. Expecting '%s' but got '%s'",
 					patch->gameId, patch->movie, scriptType2str(type), id, linenum,
 					patch->orig, line.c_str());


Commit: 00d592f6e4a2e8af15a1f1e1abcd8f736313ba27
    https://github.com/scummvm/scummvm/commit/00d592f6e4a2e8af15a1f1e1abcd8f736313ba27
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-17T00:13:33+02:00

Commit Message:
DIRECTOR: LINGO: Patch malformed Lingo in jman-win

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 710b559fa4..2dd188fc2f 100644
--- a/engines/director/lingo/lingo-patcher.cpp
+++ b/engines/director/lingo/lingo-patcher.cpp
@@ -67,6 +67,8 @@ struct ScriptPatch {
 	// Unbalanced 'end if' at the end of the script
 	{"jman", kPlatformWindows, "mmm/TSA RR 06", kScoreScript, 26,
 			17, "end if", ""},
+	{"jman", kPlatformWindows, "mmm/Mars Space Game 05", kMovieScript, 3,
+			68, "set DamageParameter = (gProcessorSpeed/2) + 7)", "set DamageParameter = (gProcessorSpeed/2) + 7"},
 
 	{nullptr, kPlatformUnknown, nullptr, kNoneScript, 0, 0, nullptr, nullptr}
 };