diff options
| author | Colin Snover | 2017-02-16 12:58:47 -0600 |
|---|---|---|
| committer | Colin Snover | 2017-04-23 13:07:25 -0500 |
| commit | b3ecc54a7a3023a648378771f543b060f46f7fae (patch) | |
| tree | 0f6698d166933c1b0a835352c4d8153581f3a5dc /engines | |
| parent | f58019b6800f9ce72549ae6ec245766adbebeae2 (diff) | |
| download | scummvm-rg350-b3ecc54a7a3023a648378771f543b060f46f7fae.tar.gz scummvm-rg350-b3ecc54a7a3023a648378771f543b060f46f7fae.tar.bz2 scummvm-rg350-b3ecc54a7a3023a648378771f543b060f46f7fae.zip | |
SCI: Always search for .CSC script patches
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.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/resource.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index c4df47d1b6..f5edda9eb0 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -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) { |