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

[bluegr]

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:
e04c4b06a0 SCI: Handle cases where ressci.001 exists, together with resource.aud


Commit: e04c4b06a0b9e7756f28c14dee6eda5c30e1edb6
    https://github.com/scummvm/scummvm/commit/e04c4b06a0b9e7756f28c14dee6eda5c30e1edb6
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-02-14T02:42:01+02:00

Commit Message:
SCI: Handle cases where ressci.001 exists, together with resource.aud

In this case, the multi-disc audio handling code should not run.
Fixes a spurious warning in Lighthouse

Changed paths:
    engines/sci/resource/resource.cpp


diff --git a/engines/sci/resource/resource.cpp b/engines/sci/resource/resource.cpp
index eb6d575390..48a1fc6d24 100644
--- a/engines/sci/resource/resource.cpp
+++ b/engines/sci/resource/resource.cpp
@@ -676,7 +676,7 @@ int ResourceManager::addAppropriateSources() {
 		if (mapFiles.empty() || files.empty())
 			return 0;
 
-		if (Common::File::exists("ressci.001")) {
+		if (Common::File::exists("ressci.001") && !Common::File::exists("resource.aud")) {
 			_multiDiscAudio = true;
 		}