diff options
| author | Colin Snover | 2016-08-19 10:21:33 -0500 |
|---|---|---|
| committer | Colin Snover | 2016-08-19 15:23:10 -0500 |
| commit | b106ba1102739381aac1813fcfbac2461c9e6b7d (patch) | |
| tree | 9ce2da6f9ac1a353c3b11990ed209716e0bfb36d | |
| parent | c4250c05d02dc25fb20e8314ec960bec5ac59779 (diff) | |
| download | scummvm-rg350-b106ba1102739381aac1813fcfbac2461c9e6b7d.tar.gz scummvm-rg350-b106ba1102739381aac1813fcfbac2461c9e6b7d.tar.bz2 scummvm-rg350-b106ba1102739381aac1813fcfbac2461c9e6b7d.zip | |
SCI: Avoid attempts to use exe/txt/dll files as patches
Fixes some false warnings when games try to read in non-patch
files with names that start with A/B/S/T.
| -rw-r--r-- | engines/sci/resource.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index f2321f5589..2bd941b11a 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -1493,6 +1493,12 @@ void ResourceManager::readResourcePatchesBase36() { for (Common::ArchiveMemberList::const_iterator x = files.begin(); x != files.end(); ++x) { name = (*x)->getName(); + // The S/T prefixes often conflict with non-patch files and generate + // spurious warnings about invalid patches + if (name.hasSuffix(".DLL") || name.hasSuffix(".EXE") || name.hasSuffix(".TXT")) { + continue; + } + ResourceId resource36 = convertPatchNameBase36((ResourceType)i, name); /* |