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

[elasota]

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:
d3acc1a8e0 MTROPOLIS: Add detection entry for German Obsidian release
c70239687a MTROPOLIS: Add RESOURCE folder as additional game data directory


Commit: d3acc1a8e0a9e908b151b8628df95647b3d1050f
    https://github.com/scummvm/scummvm/commit/d3acc1a8e0a9e908b151b8628df95647b3d1050f
Author: Lothar Serra Mari (mail at serra.me)
Date: 2022-06-18T17:40:08-04:00

Commit Message:
MTROPOLIS: Add detection entry for German Obsidian release

Changed paths:
    engines/mtropolis/detection_tables.h


diff --git a/engines/mtropolis/detection_tables.h b/engines/mtropolis/detection_tables.h
index a27e8935908..56c194cfdc9 100644
--- a/engines/mtropolis/detection_tables.h
+++ b/engines/mtropolis/detection_tables.h
@@ -80,6 +80,34 @@ static const MTropolisGameDescription gameDescriptions[] = {
 		0,
 		0,
 	},
+	{
+		// Obsidian, German Windows, installed
+		// Released via the "ProSieben Mystery" series
+		{
+			"obsidian",
+			"installed, CD",
+			{
+				{ "Obsidian.exe", 0, "0b50a779136ae6c9cc8bcfa3148c1127", 762368 },
+				{ "Obsidian.c95", 0, "fea68ff30ff319cdab30b79d2850a480", 145920 },
+				{ "RSGKit.r95", 0, "071dc9098f9610fcec45c96342b1b69a", 625152 },
+				{ "MCURSORS.C95", 0, "dcbe480913eebf233d0cdc33809bf048", 87040 },
+				{ "Obsidian Data 1.MPL", 0, "f96fc3a3a0a645009265c74c5fcb2c6a", 18972392 },
+				{ "Obsidian Data 2.MPX", 0, "b42a5a7bc36b2de2f9882e8a05435857", 559682181 },
+				{ "Obsidian Data 3.MPX", 0, "d4cb1a43d129019f8c2172a09cbedf2a", 614519546 },
+				{ "Obsidian Data 4.MPX", 0, "ae3095e5ac0a3a8984758ee76420e9b1", 591403514 },
+				{ "Obsidian Data 5.MPX", 0, "e8939423008a47c77735e16d7391a947", 578314080 },
+				{ "Obsidian Data 6.MPX", 0, "1295c1fe1a9113dbf2764b7024bf759d", 552452074 },
+				AD_LISTEND
+			},
+			Common::DE_DEU,
+			Common::kPlatformWindows,
+			ADGF_NO_FLAGS,
+			GUIO0()
+		},
+		GID_OBSIDIAN,
+		0,
+		0,
+	},
 
 	{ AD_TABLE_END_MARKER, 0, 0, 0 }
 };


Commit: c70239687a713a493e315549ed347c4195222583
    https://github.com/scummvm/scummvm/commit/c70239687a713a493e315549ed347c4195222583
Author: Lothar Serra Mari (mail at serra.me)
Date: 2022-06-18T17:40:08-04:00

Commit Message:
MTROPOLIS: Add RESOURCE folder as additional game data directory

At least the German Obsidian release stores the resource files directly
in a folder called 'RESOURCE' in the root directory of the game installation.

Without this patch, one needs to manually copy the files located in the
RESOURCE folder to the game's root directory.

Changed paths:
    engines/mtropolis/mtropolis.cpp


diff --git a/engines/mtropolis/mtropolis.cpp b/engines/mtropolis/mtropolis.cpp
index 8e0894c2b05..b12da8c8ebc 100644
--- a/engines/mtropolis/mtropolis.cpp
+++ b/engines/mtropolis/mtropolis.cpp
@@ -313,6 +313,7 @@ MTropolisEngine::MTropolisEngine(OSystem *syst, const MTropolisGameDescription *
 		const Common::FSNode gameDataDir(ConfMan.get("path"));
 		SearchMan.addSubDirectoryMatching(gameDataDir, "Obsidian");
 		SearchMan.addSubDirectoryMatching(gameDataDir, "Obsidian/RESOURCE");
+		SearchMan.addSubDirectoryMatching(gameDataDir, "RESOURCE");
 	}
 }