thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Load volume resource files in consistent order

Browse source 
The order that volume resources are loaded subtly affects engine
behavior when they contain different versions of the same resource.
This order has been the file enumeration order from the operating
system, causing inconsistent behavior between environments and even
between two different directories of identical files.
This commit is contained in:
sluicebox 2020-11-18 07:08:31 -08:00
parent 3d02a6381c
commit e5b10e557c
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/sci/resource.cpp
View file

@ -640,6 +640,7 @@ int ResourceManager::addAppropriateSources() {
Common::ArchiveMemberList files;
SearchMan.listMatchingMembers(files, "resource.0##");
Common::sort(files.begin(), files.end(), Common::ArchiveMemberListComparator());
for (Common::ArchiveMemberList::const_iterator x = files.begin(); x != files.end(); ++x) {
const Common::String name = (*x)->getName();
const char *dot = strrchr(name.c_str(), '.');
@ -679,6 +680,7 @@ int ResourceManager::addAppropriateSources() {
_multiDiscAudio = true;
}
Common::sort(mapFiles.begin(), mapFiles.end(), Common::ArchiveMemberListComparator());
for (Common::ArchiveMemberList::const_iterator mapIterator = mapFiles.begin(); mapIterator != mapFiles.end(); ++mapIterator) {
Common::String mapName = (*mapIterator)->getName();
int mapNumber = atoi(strrchr(mapName.c_str(), '.') + 1);