[Scummvm-git-logs] scummvm master -> 8f928b5dcf4de982fdbf7d0a07df7874a385cdf6

[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:
eaa5bc15fe DIRECTOR: allow patcher to read Punycode
8f928b5dcf DIRECTOR: add henachoco03 patch


Commit: eaa5bc15fef5c3fa97f9e224e31111742088b02e
    https://github.com/scummvm/scummvm/commit/eaa5bc15fef5c3fa97f9e224e31111742088b02e
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2021-11-20T01:19:15+01:00

Commit Message:
DIRECTOR: allow patcher to read Punycode

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 ddfb09b877..388017e242 100644
--- a/engines/director/lingo/lingo-patcher.cpp
+++ b/engines/director/lingo/lingo-patcher.cpp
@@ -20,6 +20,7 @@
  *
  */
 
+#include "common/punycode.h"
 #include "director/director.h"
 #include "director/cast.h"
 #include "director/movie.h"
@@ -193,7 +194,8 @@ Common::U32String LingoCompiler::patchLingoCode(const Common::U32String &line, L
 		}
 
 		// Now expensive ones
-		if (movie.compareToIgnoreCase(patch->movie) || strcmp(patch->gameId, g_director->getGameId())
+		U32String moviename = punycode_decode(patch->movie);
+		if (movie.compareToIgnoreCase(moviename) || strcmp(patch->gameId, g_director->getGameId())
 				|| (patch->extra && strcmp(patch->extra, g_director->getExtra()))) {
 			patch++;
 			continue;


Commit: 8f928b5dcf4de982fdbf7d0a07df7874a385cdf6
    https://github.com/scummvm/scummvm/commit/8f928b5dcf4de982fdbf7d0a07df7874a385cdf6
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2021-11-20T01:19:15+01:00

Commit Message:
DIRECTOR: add henachoco03 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 388017e242..ccd3931bb0 100644
--- a/engines/director/lingo/lingo-patcher.cpp
+++ b/engines/director/lingo/lingo-patcher.cpp
@@ -174,6 +174,12 @@ struct ScriptPatch {
 	{"snh", "", kPlatformWindows, "SNHstart", kMovieScript, 0, 0,
 			14, "set mytest3 = FileIO(mnew, \"read\" mymovie)", "set mytest3 = FileIO(mnew, \"read\", mymovie)"},
 
+	// Ambiguous syntax that's parsed differently between D3 and later versions
+	{"henachoco03", "", kPlatformMacintosh, "xn--oj7cxalkre7cjz1d2agc0e8b1cm", kMovieScript, 0, 0,
+			183, "locaobject(mLHizikaraHand (rhenka + 1),dotti)", "locaobject(mLHizikaraHand,(rhenka + 1),dotti)"},
+	{"henachoco03", "", kPlatformMacintosh, "xn--oj7cxalkre7cjz1d2agc0e8b1cm", kMovieScript, 0, 0,
+			196, "locaobject(mRHizikaraHand (rhenka + 1),dotti)", "locaobject(mRHizikaraHand,(rhenka + 1),dotti)"},
+
 	{nullptr, nullptr, kPlatformUnknown, nullptr, kNoneScript, 0, 0, 0, nullptr, nullptr}
 };