libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-06 02:46:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SCI: Fix Lighthouse SCI2.1 demo

Browse Source 
This is a regression from r54155. Fixed by moving the chunk resource loading earlier.

svn-id: r54162
This commit is contained in:
Matthew Hoops 2010-11-09 16:56:31 +00:00
parent 567441f032
commit 4582a94ff9
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
engines/sci/resource.cpp
View File

@ -667,6 +667,22 @@ int ResourceManager::addInternalSources() {
}
delete resources;
#ifdef ENABLE_SCI32
if (_mapVersion >= kResVersionSci2) {
// If we have no scripts, but chunk 0 is present, open up the chunk
// to try to get to any scripts in there. The Lighthouse SCI2.1 demo
// does exactly this.
resources = listResources(kResourceTypeScript);
if (resources->empty() && testResource(ResourceId(kResourceTypeChunk, 0)))
addResourcesFromChunk(0);
delete resources;
}
#endif
return 1;
}
@ -865,21 +881,6 @@ void ResourceManager::init() {
}
#endif
}
#ifdef ENABLE_SCI32
if (getSciVersion() >= SCI_VERSION_2_1) {
// If we have no scripts, but chunk 0 is present, open up the chunk
// to try to get to any scripts in there. The Lighthouse SCI2.1 demo
// does exactly this.
Common::List<ResourceId> *scriptList = listResources(kResourceTypeScript);
if (scriptList->empty() && testResource(ResourceId(kResourceTypeChunk, 0)))
addResourcesFromChunk(0);
delete scriptList;
}
#endif
}
ResourceManager::~ResourceManager() {