[Scummvm-git-logs] scummvm master -> 630f479b9bdbec4dad64a5cfceb9b472759818f7

[criezy]

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:
630f479b9b SCUMM: Add detection and support for Mac Remastered versions


Commit: 630f479b9bdbec4dad64a5cfceb9b472759818f7
    https://github.com/scummvm/scummvm/commit/630f479b9bdbec4dad64a5cfceb9b472759818f7
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2025-01-09T21:21:57Z

Commit Message:
SCUMM: Add detection and support for Mac Remastered versions

They could already be detected and run by navigating to the Resources
folder in the app bundle when adding the game. But now we just need to
select the app bundle itself, as was already possible for older Mac
Steam version of the games.

Changed paths:
    engines/scumm/detection_tables.h
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 5cc30181abb..ae47330d00a 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -48,6 +48,7 @@ static const char *const directoryGlobs[] = {
 	"rooms *",  // Mac version of indy3/loom
 	"Contents", // Mac Steam versions
 	"MacOS",    // Mac Steam versions
+	"Resources", // Mac SE/Remastered versions
 	0
 };
 
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 8859f0191c8..937950cce49 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1055,6 +1055,10 @@ Common::Error ScummEngine::init() {
 	// are treated like any other SCUMM game.
 	if (_filenamePattern.genMethod == kGenUnchanged) {
 		if (_game.features & GF_DOUBLEFINE_PAK) {
+			// Extra directories needed for the Mac SE/Remaster versions
+			SearchMan.addSubDirectoryMatching(gameDataDir, "Contents");
+			SearchMan.addSubDirectoryMatching(gameDataDir, "Contents/MacOS");
+			SearchMan.addSubDirectoryMatching(gameDataDir, "Contents/Resources");
 			// Container files used in remastered/SE versions
 			_containerFile = _filenamePattern.pattern; // needs to be set before instantiating ScummPAKFile
 			if (_game.id == GID_MANIAC)