[Scummvm-git-logs] scummvm master -> 33ac09433fb475640861e2a3ac92d258c35d60f5

[sev-]

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

Summary:
bfddffd5d0 GRIM: Always detect all games.
e0e3e3abe3 GRIM: Added checksums for Russian EMI
8d9eb6a9c8 GRIM: Add fix for Russian version
33ac09433f GRIM: Do not launch EMI when it is disabled in configure


Commit: bfddffd5d028ddd0f8ef7f5a761f09816691c4dd
    https://github.com/scummvm/scummvm/commit/bfddffd5d028ddd0f8ef7f5a761f09816691c4dd
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-16T19:05:53+02:00

Commit Message:
GRIM: Always detect all games.

Since we have detection in static part, we need to detect it always.

Changed paths:
    engines/grim/detection.cpp


diff --git a/engines/grim/detection.cpp b/engines/grim/detection.cpp
index 2d31a1bb7c..712f9f11bc 100644
--- a/engines/grim/detection.cpp
+++ b/engines/grim/detection.cpp
@@ -337,7 +337,7 @@ static const GrimGameDescription gameDescriptions[] = {
 		},
 		GType_GRIM
 	},
-#ifdef ENABLE_MONKEY4
+
 	{
 		// Escape from Monkey Island English
 		{
@@ -581,7 +581,6 @@ static const GrimGameDescription gameDescriptions[] = {
 		},
 		GType_MONKEY4
 	},
-#endif // ENABLE_MONKEY4
 
 	{ AD_TABLE_END_MARKER, GType_GRIM }
 };


Commit: e0e3e3abe3deed5235b20c2f212ba6f06c69e562
    https://github.com/scummvm/scummvm/commit/e0e3e3abe3deed5235b20c2f212ba6f06c69e562
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-16T19:05:53+02:00

Commit Message:
GRIM: Added checksums for Russian EMI

Changed paths:
    engines/grim/md5check.cpp


diff --git a/engines/grim/md5check.cpp b/engines/grim/md5check.cpp
index 2d688a2562..51facd2f1a 100644
--- a/engines/grim/md5check.cpp
+++ b/engines/grim/md5check.cpp
@@ -212,6 +212,7 @@ const char *emi_artAll[] = {
 	"f2ec4854639cd25792dd3e88fb08a1e6", // spanish patched
 	"e0fbba846efca842553bb1a726a25dcf", // french patched
 	"b9838ab13a672a42b1fbc8893b94ca26", // italian patched
+	"52111c719bcccacd4b4b8548007edd9c" 	// Russian version
 };
 const char *emi_artJam[] = {
 	"e5ff286dbf7b23d1ad41dd8defe48291", // english patched
@@ -251,6 +252,7 @@ const char *emi_lip[] = {
 };
 const char *emi_local[] = {
 	"c3b694d941c05264e8c37dc2be75ca1c", // english patched
+	"6bd6582e9ab602c1f86c8593563cc9e5"	// Russian version
 };
 const char *emi_patch[] = {
 	"067100a100b3ca9283b796480aa39b52", // english patched


Commit: 8d9eb6a9c86a46c8a9312f561acabe208b0e0e36
    https://github.com/scummvm/scummvm/commit/8d9eb6a9c86a46c8a9312f561acabe208b0e0e36
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-16T19:05:53+02:00

Commit Message:
GRIM: Add fix for Russian version

Changed paths:
    engines/grim/localize.cpp


diff --git a/engines/grim/localize.cpp b/engines/grim/localize.cpp
index be234eb6bb..88384aed77 100644
--- a/engines/grim/localize.cpp
+++ b/engines/grim/localize.cpp
@@ -99,9 +99,10 @@ Localizer::Localizer() {
 				}
 			}
 		case MKTAG('D', 'O', 'E', 'L'):
+		case MKTAG('a', 'r', 't', 'p'):
 			break;
 		default:
-			error("Invalid magic reading %s: %08x", filename.c_str(), READ_BE_UINT32(data));
+			error("Invalid magic reading %s: %08x (%s)", filename.c_str(), READ_BE_UINT32(data), tag2str(READ_BE_UINT32(data)));
 		}
 	}
 


Commit: 33ac09433fb475640861e2a3ac92d258c35d60f5
    https://github.com/scummvm/scummvm/commit/33ac09433fb475640861e2a3ac92d258c35d60f5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-16T19:05:53+02:00

Commit Message:
GRIM: Do not launch EMI when it is disabled in configure

Changed paths:
    engines/grim/metaengine.cpp


diff --git a/engines/grim/metaengine.cpp b/engines/grim/metaengine.cpp
index 66aebd5c52..b6219538ef 100644
--- a/engines/grim/metaengine.cpp
+++ b/engines/grim/metaengine.cpp
@@ -57,7 +57,11 @@ bool GrimMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGame
 
 	if (gd) {
 		if (gd->gameType == GType_MONKEY4) {
+#ifdef ENABLE_MONKEY4
 			*engine = new EMIEngine(syst, gd->desc.flags, gd->gameType, gd->desc.platform, gd->desc.language);
+#else
+			return false;
+#endif
 		} else {
 			*engine = new GrimEngine(syst, gd->desc.flags, gd->gameType, gd->desc.platform, gd->desc.language);
 		}