diff options
author | Filippos Karapetis | 2010-11-09 17:07:34 +0000 |
---|---|---|
committer | Filippos Karapetis | 2010-11-09 17:07:34 +0000 |
commit | 55f0b88c07f02eb2fcdeb5284131acd10e13eee8 (patch) | |
tree | 9adf2071fd8ce900cb3082fce7ec5fa75c862d4c /engines/sci/resource.cpp | |
parent | 4582a94ff9045a132cd473e5cc61d20c382d7056 (diff) | |
download | scummvm-rg350-55f0b88c07f02eb2fcdeb5284131acd10e13eee8.tar.gz scummvm-rg350-55f0b88c07f02eb2fcdeb5284131acd10e13eee8.tar.bz2 scummvm-rg350-55f0b88c07f02eb2fcdeb5284131acd10e13eee8.zip |
SCI: Fixed the fallback detector again
This is a regression from r54155, as we previously ignored the result of
addInternalSources() in the fallback detector
svn-id: r54163
Diffstat (limited to 'engines/sci/resource.cpp')
-rw-r--r-- | engines/sci/resource.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 703dc47760..f08c72a833 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -813,7 +813,7 @@ void ResourceManager::freeResourceSources() { ResourceManager::ResourceManager() { } -void ResourceManager::init() { +void ResourceManager::init(bool initFromFallbackDetector) { _memoryLocked = 0; _memoryLRU = 0; _LRU.clear(); @@ -845,12 +845,12 @@ void ResourceManager::init() { scanNewSources(); - if (!addInternalSources()) { - error("Somehow I can't seem to find the sound files I need (RESOURCE.AUD/RESOURCE.SFX), aborting"); - return; - } + if (!initFromFallbackDetector) { + if (!addInternalSources()) + error("Somehow I can't seem to find the sound files I need (RESOURCE.AUD/RESOURCE.SFX), aborting"); - scanNewSources(); + scanNewSources(); + } detectSciVersion(); |