[Scummvm-git-logs] scummvm master -> 7d33a4d4806a293469462283c36f5ae8501fc968

sev- sev at scummvm.org
Fri Apr 23 18:08:00 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:
7d33a4d480 KYRA: Added support for GOG LOL release


Commit: 7d33a4d4806a293469462283c36f5ae8501fc968
    https://github.com/scummvm/scummvm/commit/7d33a4d4806a293469462283c36f5ae8501fc968
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-04-23T20:07:38+02:00

Commit Message:
KYRA: Added support for GOG LOL release

Changed paths:
    engines/kyra/detection.cpp
    engines/kyra/resource/resource.cpp


diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index 29b0e7d657..c0a8b8a0c2 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -31,6 +31,7 @@ namespace {
 
 const char *const directoryGlobs[] = {
 	"malcolm",
+	"data", // LOL GOG release
 	0
 };
 
diff --git a/engines/kyra/resource/resource.cpp b/engines/kyra/resource/resource.cpp
index 86afa6d1c3..30d8c518d0 100644
--- a/engines/kyra/resource/resource.cpp
+++ b/engines/kyra/resource/resource.cpp
@@ -36,6 +36,9 @@ Resource::Resource(KyraEngine_v1 *vm) : _archiveCache(), _files(), _archiveFiles
 	if (_vm->game() == GI_KYRA3)
 		SearchMan.addSubDirectoryMatching(Common::FSNode(ConfMan.get("path")), "malcolm");
 
+	if (_vm->game() == GI_LOL)
+		SearchMan.addSubDirectoryMatching(Common::FSNode(ConfMan.get("path")), "data", 0, 2);
+
 	_files.add("global_search", &Common::SearchManager::instance(), 3, false);
 	// compressed installer archives are added at level '2',
 	// but that's done in Resource::reset not here




More information about the Scummvm-git-logs mailing list