[Scummvm-git-logs] scummvm master -> 8c3b3f5efa882f1e4bf8cc61325296d603e073c0

[alxpnv]

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:
a2b40f5327 ASYLUM: Add detection entry for German Steam version
8c3b3f5efa ASYLUM: fix paths for Steam versions


Commit: a2b40f53279a1d9c6d7dc88a5d8865efaf2bb17a
    https://github.com/scummvm/scummvm/commit/a2b40f53279a1d9c6d7dc88a5d8865efaf2bb17a
Author: Lothar Serra Mari (mail at serra.me)
Date: 2021-09-01T10:23:56+03:00

Commit Message:
ASYLUM: Add detection entry for German Steam version

Changed paths:
    engines/asylum/detection_tables.h


diff --git a/engines/asylum/detection_tables.h b/engines/asylum/detection_tables.h
index 9c9e6804f6..1e58f63538 100644
--- a/engines/asylum/detection_tables.h
+++ b/engines/asylum/detection_tables.h
@@ -103,6 +103,21 @@ static const ADGameDescription gameDescriptions[] = {
 		ADGF_UNSTABLE | ADGF_DROPPLATFORM,
 		GUIO0()
 	},
+	{
+		"asylum",
+		"Steam",
+		{
+			{"SNTRM.DAT", 0, "f427fda37a0e29afd4acf982c4cb9fb0", 8930},
+			{"RES.000",   0, "0578f326b40d22f661ac93cf49dc2c19", 285658},
+			{"SCN.006",   0, "3a5b54da08198012dc0614114782d5fb", 2918330},
+			{"MOV000_2_SMK.ogv", 0, NULL, -1},
+			AD_LISTEND
+		},
+		Common::DE_DEU,
+		Common::kPlatformWindows,
+		ADGF_UNSTABLE | ADGF_DROPPLATFORM,
+		GUIO0()
+	},
 	{
 		"asylum",
 		"French Version",


Commit: 8c3b3f5efa882f1e4bf8cc61325296d603e073c0
    https://github.com/scummvm/scummvm/commit/8c3b3f5efa882f1e4bf8cc61325296d603e073c0
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-09-01T10:23:56+03:00

Commit Message:
ASYLUM: fix paths for Steam versions

Changed paths:
    engines/asylum/asylum.cpp
    engines/asylum/asylum.h
    engines/asylum/detection.cpp
    engines/asylum/detection_tables.h


diff --git a/engines/asylum/asylum.cpp b/engines/asylum/asylum.cpp
index ee628dcfa6..95254fe44f 100644
--- a/engines/asylum/asylum.cpp
+++ b/engines/asylum/asylum.cpp
@@ -70,11 +70,18 @@ AsylumEngine::AsylumEngine(OSystem *system, const ADGameDescription *gd) : Engin
 	_delayedVideoIndex = -1;
 	_previousScene = NULL;
 
+	// Game data
+	Common::String dataDir("data/");
+	if (checkGameVersion("Steam")) {
+		dataDir += getLanguageCode(getLanguage());
+		dataDir += '/';
+	}
+
 	// Add default search directories
-	const Common::FSNode gameDataDir(ConfMan.get("path"));
-	SearchMan.addSubDirectoryMatching(gameDataDir, "data");
-	SearchMan.addSubDirectoryMatching(gameDataDir, "data/vids");
-	SearchMan.addSubDirectoryMatching(gameDataDir, "data/music");
+	const Common::FSNode gamePath(ConfMan.get("path"));
+	SearchMan.addSubDirectoryMatching(gamePath, dataDir);
+	SearchMan.addSubDirectoryMatching(gamePath, dataDir + "vids");
+	SearchMan.addSubDirectoryMatching(gamePath, dataDir + "music");
 
 	// Initialize random number source
 	_rnd = new Common::RandomSource("asylum");
diff --git a/engines/asylum/asylum.h b/engines/asylum/asylum.h
index f36aa3b622..81ce8b54d8 100644
--- a/engines/asylum/asylum.h
+++ b/engines/asylum/asylum.h
@@ -23,6 +23,7 @@
 #ifndef ASYLUM_ASYLUM_H
 #define ASYLUM_ASYLUM_H
 
+#include "common/language.h"
 #include "common/random.h"
 #include "common/rect.h"
 #include "common/scummsys.h"
@@ -198,6 +199,7 @@ public:
 	void saveLoadWithSerializer(Common::Serializer &s);
 
 	bool checkGameVersion(const char *version) { return !strcmp(_gameDescription->extra, version); }
+	Common::Language getLanguage() { return _gameDescription->language; }
 
 private:
 	const ADGameDescription *_gameDescription;
diff --git a/engines/asylum/detection.cpp b/engines/asylum/detection.cpp
index f35ec3b55b..00efd4fa5e 100644
--- a/engines/asylum/detection.cpp
+++ b/engines/asylum/detection.cpp
@@ -48,7 +48,7 @@ class AsylumMetaEngineDetection : public AdvancedMetaEngineDetection {
 public:
 	AsylumMetaEngineDetection() : AdvancedMetaEngineDetection(Asylum::gameDescriptions, sizeof(ADGameDescription), asylumGames) {
 		_md5Bytes = 0;
-		_maxScanDepth = 3;
+		_maxScanDepth = 4;
 		_directoryGlobs = Asylum::directoryGlobs;
 	}
 
diff --git a/engines/asylum/detection_tables.h b/engines/asylum/detection_tables.h
index 1e58f63538..4986e862f5 100644
--- a/engines/asylum/detection_tables.h
+++ b/engines/asylum/detection_tables.h
@@ -29,6 +29,9 @@ namespace Asylum {
 
 static const char *directoryGlobs[] = {
 	"Data",
+	"DE",
+	"EN",
+	"FR",
 	"Vids",
 	0
 };