[Scummvm-git-logs] scummvm master -> 2164b8ac36bcc3c5b44a2e5fb248286d48bede6d

[bluegr]

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

Summary:
116d29c77f AGOS: SIMON2: Correctly detect Mac/Amiga Simon2. Fixes bug #16705
9685fbded2 AGOS: SIMON2: Fix comments related to Mac/Amiga release
2164b8ac36 AGOS: SIMON2: Remove strcmp from isSimon2MacAmiga


Commit: 116d29c77f66b50ced27e7c82a313d636f543591
    https://github.com/scummvm/scummvm/commit/116d29c77f66b50ced27e7c82a313d636f543591
Author: Robert Megone (robert.megone at gmail.com)
Date: 2026-04-25T22:39:13+03:00

Commit Message:
AGOS: SIMON2: Correctly detect Mac/Amiga Simon2. Fixes bug #16705

Changed paths:
    engines/agos/agos.cpp
    engines/agos/agos.h
    engines/agos/detection_tables.h
    engines/agos/metaengine.cpp


diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index d5b26a481af..d837368b740 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -644,8 +644,8 @@ Common::Error AGOSEngine::init() {
 
 	_midi = new MidiPlayer(this);
 
-	if ((getGameType() == GType_SIMON2 && getPlatform() == Common::kPlatformWindows) || 
-			(getGameType() == GType_SIMON2 && getPlatform() == Common::kPlatformAmiga) ||
+	if ((getGameType() == GType_SIMON2 && getPlatform() == Common::kPlatformWindows) ||
+			(getGameType() == GType_SIMON2 && (getPlatform() == Common::kPlatformAmiga || isSimon2MacAmiga())) ||
 			(getGameType() == GType_SIMON1 && getPlatform() == Common::kPlatformWindows) ||
 			((getFeatures() & GF_TALKIE) && getPlatform() == Common::kPlatformAcorn) ||
 			(getPlatform() == Common::kPlatformDOS && getGameType() != GType_PN && getGameType() != GType_FF) ||
diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index 3f06b6a331b..f0eb250c1f7 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -288,6 +288,7 @@ public:
 	int getGameType() const;
 	uint32 getFeatures() const;
 	const char *getExtra() const;
+	bool isSimon2MacAmiga() const;
 	Common::Language getLanguage() const;
 	Common::Platform getPlatform() const;
 	const char *getFileName(int type) const;
diff --git a/engines/agos/detection_tables.h b/engines/agos/detection_tables.h
index 50336280e43..6f66332b0f5 100644
--- a/engines/agos/detection_tables.h
+++ b/engines/agos/detection_tables.h
@@ -3054,11 +3054,12 @@ static const AGOSGameDescription gameDescriptions[] = {
 		GF_TALKIE
 	},
 
-	// Simon the Sorcerer 2 - Amiga CD (Update 5)
+	// Simon the Sorcerer 2 - Mac/Amiga CD (Update 5)
+	// kPlatformUnknown because Mac/Amiga(update 5) are identical.
 	{
 		{
 			"simon2",
-			"Amiga CD - Update 5",
+			"Mac/Amiga(Update 5)",
 
 			{
 				{ "gsptr30",		GAME_BASEFILE,	"608e277904d87dd28725fa08eacc2c0d", 58652},
@@ -3070,7 +3071,7 @@ static const AGOSGameDescription gameDescriptions[] = {
 				AD_LISTEND
 			},
 			Common::EN_ANY,
-			Common::kPlatformAmiga,
+			Common::kPlatformUnknown,
 			ADGF_CD,
 			GUIO1(GAMEOPTION_DISABLE_FADE_EFFECTS)
 		},
diff --git a/engines/agos/metaengine.cpp b/engines/agos/metaengine.cpp
index 3598c6e88a0..bee4bbed3b4 100644
--- a/engines/agos/metaengine.cpp
+++ b/engines/agos/metaengine.cpp
@@ -373,6 +373,14 @@ const char *AGOSEngine::getExtra() const {
 	return _gameDescription->desc.extra;
 }
 
+//The Mac release of Simon 2 uses identical data to the Amiga release with update 5
+//It is still distinct from the Original Amiga release(simon2.german is different)
+bool AGOSEngine::isSimon2MacAmiga() const {
+	return getGameType() == GType_SIMON2 &&
+		getPlatform() == Common::kPlatformUnknown &&
+		!strcmp(getExtra(), "Mac/Amiga(Update 5)");
+}
+
 Common::Language AGOSEngine::getLanguage() const {
 	return _gameDescription->desc.language;
 }


Commit: 9685fbded2384abdae65ef7201f7fa691ccdf6e5
    https://github.com/scummvm/scummvm/commit/9685fbded2384abdae65ef7201f7fa691ccdf6e5
Author: Robert Megone (robert.megone at gmail.com)
Date: 2026-04-25T22:39:13+03:00

Commit Message:
AGOS: SIMON2: Fix comments related to Mac/Amiga release

Co-authored-by: Filippos Karapetis <bluegr at gmail.com>

Changed paths:
    engines/agos/metaengine.cpp


diff --git a/engines/agos/metaengine.cpp b/engines/agos/metaengine.cpp
index bee4bbed3b4..ff2ac9fe0a8 100644
--- a/engines/agos/metaengine.cpp
+++ b/engines/agos/metaengine.cpp
@@ -373,8 +373,8 @@ const char *AGOSEngine::getExtra() const {
 	return _gameDescription->desc.extra;
 }
 
-//The Mac release of Simon 2 uses identical data to the Amiga release with update 5
-//It is still distinct from the Original Amiga release(simon2.german is different)
+// The Mac release of Simon 2 uses identical data to the Amiga release with update 5.
+// It is still distinct from the Original Amiga release (simon2.german is different)
 bool AGOSEngine::isSimon2MacAmiga() const {
 	return getGameType() == GType_SIMON2 &&
 		getPlatform() == Common::kPlatformUnknown &&


Commit: 2164b8ac36bcc3c5b44a2e5fb248286d48bede6d
    https://github.com/scummvm/scummvm/commit/2164b8ac36bcc3c5b44a2e5fb248286d48bede6d
Author: Robert Megone (robert.megone at gmail.com)
Date: 2026-04-25T22:39:13+03:00

Commit Message:
AGOS: SIMON2: Remove strcmp from isSimon2MacAmiga

Changed paths:
    engines/agos/metaengine.cpp


diff --git a/engines/agos/metaengine.cpp b/engines/agos/metaengine.cpp
index ff2ac9fe0a8..1f66dec7050 100644
--- a/engines/agos/metaengine.cpp
+++ b/engines/agos/metaengine.cpp
@@ -377,8 +377,7 @@ const char *AGOSEngine::getExtra() const {
 // It is still distinct from the Original Amiga release (simon2.german is different)
 bool AGOSEngine::isSimon2MacAmiga() const {
 	return getGameType() == GType_SIMON2 &&
-		getPlatform() == Common::kPlatformUnknown &&
-		!strcmp(getExtra(), "Mac/Amiga(Update 5)");
+		getPlatform() == Common::kPlatformUnknown;
 }
 
 Common::Language AGOSEngine::getLanguage() const {