[Scummvm-git-logs] scummvm master -> 9636dd5311205537b7c7a9a4ea3c74d222967106

alxpnv a04198622 at gmail.com
Fri Nov 12 12:32:31 UTC 2021


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:
9636dd5311 ASYLUM: improve detection


Commit: 9636dd5311205537b7c7a9a4ea3c74d222967106
    https://github.com/scummvm/scummvm/commit/9636dd5311205537b7c7a9a4ea3c74d222967106
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-11-12T15:35:59+03:00

Commit Message:
ASYLUM: improve detection

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


diff --git a/engines/asylum/asylum.cpp b/engines/asylum/asylum.cpp
index a2148226c5..955d233743 100644
--- a/engines/asylum/asylum.cpp
+++ b/engines/asylum/asylum.cpp
@@ -73,18 +73,10 @@ 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 gamePath(ConfMan.get("path"));
-	SearchMan.addSubDirectoryMatching(gamePath, dataDir);
-	SearchMan.addSubDirectoryMatching(gamePath, dataDir + "vids");
-	SearchMan.addSubDirectoryMatching(gamePath, dataDir + "music");
+	SearchMan.addSubDirectoryMatching(gamePath, "vids");
+	SearchMan.addSubDirectoryMatching(gamePath, "music");
 
 	// Initialize random number source
 	_rnd = new Common::RandomSource("asylum");
diff --git a/engines/asylum/detection_tables.h b/engines/asylum/detection_tables.h
index 01c3e33ca4..71b45da9b9 100644
--- a/engines/asylum/detection_tables.h
+++ b/engines/asylum/detection_tables.h
@@ -28,10 +28,6 @@ static const PlainGameDescriptor asylumGames[] = {
 namespace Asylum {
 
 static const char *directoryGlobs[] = {
-	"Data",
-	"DE",
-	"EN",
-	"FR",
 	"Vids",
 	0
 };




More information about the Scummvm-git-logs mailing list