libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 09:18:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SearchMan.listMatchingMembers does not return files in alphabetical order, so we can't rely on the order of the lists. Rework the SCI2.1+ loading code to iterate through both lists in nested loops to fix multi-archive SCI2.1 games (such as GK2).

Browse Source 
svn-id: r47612
This commit is contained in:
Matthew Hoops 2010-01-27 21:43:23 +00:00
parent 90712388f8
commit 898135b7d0
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
engines/sci/resource.cpp
View File

@ -408,19 +408,19 @@ int ResourceManager::addAppropriateSources() {
if (mapFiles.empty() || files.empty() || mapFiles.size() != files.size())
return 0;
Common::ArchiveMemberList::const_iterator fileIterator = files.begin();
Common::ArchiveMemberList::const_iterator mapIterator = mapFiles.begin();
while (fileIterator != files.end()) {
for (Common::ArchiveMemberList::const_iterator mapIterator = mapFiles.begin(); mapIterator != mapFiles.end(); ++mapIterator) {
Common::String mapName = (*mapIterator)->getName();
Common::String resName = (*fileIterator)->getName();
int mapNumber = atoi(strrchr(mapName.c_str(), '.') + 1);
const char *dot = strrchr(mapName.c_str(), '.');
int number = atoi(dot + 1);
for (Common::ArchiveMemberList::const_iterator fileIterator = files.begin(); fileIterator != files.end(); ++fileIterator) {
Common::String resName = (*fileIterator)->getName();
int resNumber = atoi(strrchr(resName.c_str(), '.') + 1);
addSource(addExternalMap(mapName.c_str(), number), kSourceVolume, resName.c_str(), number);
++fileIterator;
++mapIterator;
if (mapNumber == resNumber) {
addSource(addExternalMap(mapName.c_str(), mapNumber), kSourceVolume, resName.c_str(), mapNumber);
break;
}
}
}
}
#else