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

[sev-]

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:
16f4854a59 DIRECTOR: Always scan game directory 5 levels deep
b03f50d576 DIRECTOR: Cleanup game quirks, remove redundant ones


Commit: 16f4854a591034f2e8d1f4084936739df50b6132
    https://github.com/scummvm/scummvm/commit/16f4854a591034f2e8d1f4084936739df50b6132
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-07-10T16:09:24+02:00

Commit Message:
DIRECTOR: Always scan game directory 5 levels deep

Changed paths:
    engines/director/director.cpp


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index d77b1d1cf1f..fb1af3ad2ae 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -93,6 +93,8 @@ DirectorEngine::DirectorEngine(OSystem *syst, const DirectorGameDescription *gam
 
 	_gameDataDir = Common::FSNode(ConfMan.get("path"));
 
+	SearchMan.addDirectory(_gameDataDir.getPath(), _gameDataDir, 0, 5);
+
 	for (uint i = 0; Director::directoryGlobs[i]; i++) {
 		Common::String directoryGlob = directoryGlobs[i];
 		SearchMan.addSubDirectoryMatching(_gameDataDir, directoryGlob);


Commit: b03f50d5764ff6dd9817c27c14dcb89fb28fe58f
    https://github.com/scummvm/scummvm/commit/b03f50d5764ff6dd9817c27c14dcb89fb28fe58f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-07-10T16:09:46+02:00

Commit Message:
DIRECTOR: Cleanup game quirks, remove redundant ones

Changed paths:
    engines/director/game-quirks.cpp


diff --git a/engines/director/game-quirks.cpp b/engines/director/game-quirks.cpp
index cba38b3b6ae..f5c411eafae 100644
--- a/engines/director/game-quirks.cpp
+++ b/engines/director/game-quirks.cpp
@@ -39,16 +39,6 @@ static void quirkLzone() {
 	SearchMan.addSubDirectoryMatching(g_director->_gameDataDir, "win_data", 0, 2);
 }
 
-static void quirkMediaband() {
-	// Meet Mediaband could have up to 5 levels of directories
-	SearchMan.addDirectory(g_director->_gameDataDir.getPath(), g_director->_gameDataDir, 0, 5);
-}
-
-static void quirkWarlock() {
-	// Meet Mediaband could have up to 5 levels of directories
-	SearchMan.addDirectory(g_director->_gameDataDir.getPath(), g_director->_gameDataDir, 0, 5);
-}
-
 static void quirkMcLuhan() {
 	// TODO. Read fonts from MCLUHAN/SYSTEM directory
 	g_director->_extraSearchPath.push_back("mcluhan\\");
@@ -61,8 +51,6 @@ struct Quirk {
 } quirks[] = {
     { "kidsbox", Common::kPlatformMacintosh, &quirkKidsBox },
 	{ "lzone", Common::kPlatformWindows, &quirkLzone },
-	{ "mediaband", Common::kPlatformUnknown, &quirkMediaband },
-	{ "warlock", Common::kPlatformUnknown, &quirkWarlock },
 	{ "mcluhan", Common::kPlatformWindows, &quirkMcLuhan },
 	{ nullptr, Common::kPlatformUnknown, nullptr }
 };