diff options
author | Colin Snover | 2017-08-25 16:30:58 -0500 |
---|---|---|
committer | Colin Snover | 2017-08-25 18:53:32 -0500 |
commit | b5bd7b8478615ca604afcc28d1a0d4137ef1a4b9 (patch) | |
tree | b32fb5617f95994398553e90e6ea9b6cf4ca4bfe /engines/sci/resource.cpp | |
parent | 3ef080299336e1e1665deceea5539c34d4093024 (diff) | |
download | scummvm-rg350-b5bd7b8478615ca604afcc28d1a0d4137ef1a4b9.tar.gz scummvm-rg350-b5bd7b8478615ca604afcc28d1a0d4137ef1a4b9.tar.bz2 scummvm-rg350-b5bd7b8478615ca604afcc28d1a0d4137ef1a4b9.zip |
SCI32: Stop blacklisting 37.MAP from Phantasmagoria
It turns out that GOG.com version of Phantasmagoria needs the
37.MAP patch file because for some reason the 37.MAP in RESSCI.000
is empty (36 bytes, versus the correct file which is ~1kB).
Fortunately, this file is the same across all CDs in the original
US release, so hopefully unblocking this patch will not cause any
problems for any of the CD releases either.
Fixes Trac#10161.
Diffstat (limited to 'engines/sci/resource.cpp')
-rw-r--r-- | engines/sci/resource.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 91cdfd2949..9cca933d7a 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -1434,14 +1434,13 @@ bool ResourceManager::isBlacklistedPatch(const ResourceId &resId) const { resId.getNumber() == 65535; case GID_PHANTASMAGORIA: // The GOG release of Phantasmagoria 1 merges all resources into a - // single-disc bundle, but they also include the 65535.MAP & 37.MAP - // patch files from original game's CD 1, which (of course) do not - // contain the entries for audio from later CDs. So, just ignore these - // map patches since the correct maps will be found in the RESSCI.000 - // file. This also helps eliminate user error when copying files from - // the original CDs. - return resId.getType() == kResourceTypeMap && - (resId.getNumber() == 65535 || resId.getNumber() == 37); + // single-disc bundle, but they also include the 65535.MAP from the + // original game's CD 1, which does not contain the entries for sound + // effects from later CDs. So, just ignore this map patch since the + // correct maps will be found in the RESSCI.000 file. This also helps + // eliminate user error when copying files from the original CDs, since + // each CD had a different 65535.MAP patch file. + return resId.getType() == kResourceTypeMap && resId.getNumber() == 65535; default: return false; } |