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

SCI: Always search for .CSC script patches

Browse source 
Skipping a search for .CSC scripts when any .SCR files exist does
not work with at least Phant2, because it comes with an INSTALL.SCR
file. Searching unconditionally for .CSC files should not cause any
issues since the game scripts will either be in .SCR format or in
.CSC format, not both in the same game.
This commit is contained in:
Colin Snover 2017-02-16 12:58:47 -06:00
parent f58019b680
commit b3ecc54a7a
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
engines/sci/resource.cpp
View file

@ -1618,9 +1618,8 @@ void ResourceManager::readResourcePatches() {
SearchMan.listMatchingMembers(files, "*.p32"); // Amiga SCI1 picture patches
SearchMan.listMatchingMembers(files, "*.p64"); // Amiga AGA SCI1 (i.e. Longbow) picture patches
} else if (i == kResourceTypeScript) {
if (files.size() == 0)
// SCI3 (we can't use getSciVersion() at this point)
SearchMan.listMatchingMembers(files, "*.csc");
// SCI3 (we can't use getSciVersion() at this point)
SearchMan.listMatchingMembers(files, "*.csc");
}
for (Common::ArchiveMemberList::const_iterator x = files.begin(); x != files.end(); ++x) {