[Scummvm-git-logs] scummvm master -> be53927bc556cb45deca7832a73ce193ed02be92

AndywinXp noreply at scummvm.org
Thu Nov 7 21:05:17 UTC 2024


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:
be53927bc5 SCUMM: HE: Add detection for current MegaCat versions


Commit: be53927bc556cb45deca7832a73ce193ed02be92
    https://github.com/scummvm/scummvm/commit/be53927bc556cb45deca7832a73ce193ed02be92
Author: AndywinXp (andywinxp at gmail.com)
Date: 2024-11-07T22:05:12+01:00

Commit Message:
SCUMM: HE: Add detection for current MegaCat versions

Also add a warning, see ticket #15412:
"SCUMM/HE: Backyard Baseball 97 from Steam crashes ScummVM"

Changed paths:
    devtools/scumm-md5.txt
    engines/scumm/metaengine.cpp
    engines/scumm/scumm-md5.h


diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index 4686d7f9958..7d5da25786a 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -446,6 +446,7 @@ baseball	Backyard Baseball
 	cf8d13446ec6cb6222287a925fd47c1d	-1	en	All	-	-	-	sev
 	94db6519da85b8d08c976d8e9a858ea7	10044774	All	All	HE CUP	Preview	-	sev
 	8aed489aba45d2b9fb8a04079c9c6e6a	12876596	All	All	HE CUP	Preview	Updated	sev
+	ff90541cd06403ebea117274a3203c49	-1	en	Windows	-	Steam	Steam Re-Release	Bosca
 
 baseball2001	Backyard Baseball 2001
 	a86f9c49355579c30d4a55b477c0d869	-1	en	All	-	-	-	Kirben
@@ -472,6 +473,7 @@ football2002	Backyard Football 2002
 soccer	Backyard Soccer
 	701246819d1a70573f41bf33fc19214f	-1	en	All	-	-	-	sev
 	55923e34363c8ec6541368101d84a3bf	67178	gb	Windows	-	-	-	Sarah Onfy
+	43950303291675b305178f37a56d72ec	-1	en	Windows	-	Steam	Steam Re-Release	Bosca
 
 SoccerMLS	Backyard Soccer MLS Edition
 	bfdf584b01503f0762baded581f6a0a2	-1	en	Windows	-	-	-	sev
diff --git a/engines/scumm/metaengine.cpp b/engines/scumm/metaengine.cpp
index 988d8d19822..5e28afade6b 100644
--- a/engines/scumm/metaengine.cpp
+++ b/engines/scumm/metaengine.cpp
@@ -26,6 +26,9 @@
 #include "common/translation.h"
 #include "common/md5.h"
 
+#include "gui/dialog.h"
+#include "gui/message.h"
+
 #include "audio/mididrv.h"
 
 #include "backends/keymapper/action.h"
@@ -374,6 +377,18 @@ Common::Error ScummMetaEngine::createInstance(OSystem *syst, Engine **engine,
 		return Common::kUnsupportedGameidError;
 	}
 
+	if (res.game.heversion != 0 && !strcmp(res.extra, "Steam")) {
+		if (!strcmp(res.game.gameid, "baseball") ||
+			!strcmp(res.game.gameid, "soccer") ||
+			!strcmp(res.game.gameid, "baseball2001") ||
+			!strcmp(res.game.gameid, "basketball") ||
+			!strcmp(res.game.gameid, "football")) {
+			GUI::MessageDialog dialog(_("Warning: this re-release version contains patched game scripts,\n"
+										"and therefore it might crash or not work properly for the time being."));
+			dialog.runModal();
+		}
+	}
+
 	// If the GUI options were updated, we catch this here and update them in the users config
 	// file transparently.
 	Common::updateGameGUIOptions(customizeGuiOptions(res), getGameGUIOptionsDescriptionLanguage(res.language));
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 83d73b85130..64f1c064ae2 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
 /*
-  This file was generated by the md5table tool on Wed Sep 18 23:18:26 2024
+  This file was generated by the md5table tool on Thu Nov 07 20:43:14 2024
   DO NOT EDIT MANUALLY!
  */
 
@@ -230,6 +230,7 @@ static const MD5Table md5table[] = {
 	{ "425205754fa749f4f0b0dd9d09fa45fd", "football", "", "Demo", -1, Common::EN_ANY, Common::kPlatformUnknown },
 	{ "4252854e7d052cb488b520ba89c3eb6d", "monkey", "SE Talkie", "Unofficial SE Talkie v1.01", 9135, Common::DE_DEU, Common::kPlatformDOS },
 	{ "430bc518017b6fac046f58bab6baad5d", "monkey2", "FM-TOWNS", "", 11135, Common::JA_JPN, Common::kPlatformFMTowns },
+	{ "43950303291675b305178f37a56d72ec", "soccer", "", "Steam", -1, Common::EN_ANY, Common::kPlatformWindows },
 	{ "439a7f4adf510489981ac52308e7d7a2", "maniac", "C64", "", 1188, Common::DE_DEU, Common::kPlatformC64 },
 	{ "44ec2ceab5eb103e37b25264e3a86271", "airport", "HE 71", "Early Version", 78063, Common::EN_ANY, Common::kPlatformWindows },
 	{ "45082a5c9f42ba14dacfe1fdeeba819d", "freddicove", "HE 100", "Demo", 18422, Common::EN_ANY, Common::kPlatformUnknown },
@@ -776,6 +777,7 @@ static const MD5Table md5table[] = {
 	{ "fe60d6b5ff51b0553ac59963123b5777", "comi", "", "", 76791, Common::UNK_LANG, Common::kPlatformWindows },
 	{ "febf4a983ea5faea1c9dd6c710ebb09c", "puttcircus", "", "", 36655, Common::DE_DEU, Common::kPlatformWindows },
 	{ "ff05c07990061d97647f059c48c1d05a", "zak", "V2", "V2", -1, Common::DE_DEU, Common::kPlatformAtariST },
+	{ "ff90541cd06403ebea117274a3203c49", "baseball", "", "Steam", -1, Common::EN_ANY, Common::kPlatformWindows },
 	{ 0, 0, 0, 0, 0, Common::UNK_LANG, Common::kPlatformUnknown }
 };
 




More information about the Scummvm-git-logs mailing list