aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorColin Snover2017-01-10 19:59:32 -0600
committerColin Snover2017-03-30 19:46:27 -0500
commit9a637ec324e8c0c7ff8fab28bc8105e8609e18ba (patch)
treef1ca0d489c39216ba096f0e66eb87c2235668088 /engines
parent77a40741060f75fe1ac46217d75e77c3b2738242 (diff)
downloadscummvm-rg350-9a637ec324e8c0c7ff8fab28bc8105e8609e18ba.tar.gz
scummvm-rg350-9a637ec324e8c0c7ff8fab28bc8105e8609e18ba.tar.bz2
scummvm-rg350-9a637ec324e8c0c7ff8fab28bc8105e8609e18ba.zip
SCI32: Skip bad map 405 on CD 1 of PQ:SWAT
The resources on CD 1 are corrupt and point to invalid locations in the CD 1 RESOURCE.AUD. This can be noticed during the briefing on the Lucy Long callup, where descriptions of the map are missing and eventually the game gets stuck waiting for missing audio to finish playback.
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/resource_audio.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp
index 7151c67d2e..3be7b1084f 100644
--- a/engines/sci/resource_audio.cpp
+++ b/engines/sci/resource_audio.cpp
@@ -436,6 +436,14 @@ int ResourceManager::readAudioMapSCI11(IntMapResourceSource *map) {
const ResourceId id = ResourceId(kResourceTypeAudio36, map->_mapNumber, n & 0xffffff3f);
+ // Map 405 on CD 1 of the US release of PQ:SWAT 1.000 is broken
+ // and points to garbage in the RESOURCE.AUD. The affected audio36
+ // assets seem to be able to load successfully from one of the later
+ // CDs, so just ignore the map on this disc
+ if (g_sci->getGameId() == GID_PQSWAT && map->_volumeNumber == 1 && map->_mapNumber == 405) {
+ continue;
+ }
+
// At least version 1.00 of GK2 has multiple invalid audio36 map
// entries on CD 6
if (g_sci->getGameId() == GID_GK2 &&