diff options
| author | Colin Snover | 2017-08-26 16:02:15 -0500 |
|---|---|---|
| committer | Colin Snover | 2017-08-26 18:09:47 -0500 |
| commit | c0d3d5776e5fd976c4fd25c452c719bf5bd6d300 (patch) | |
| tree | 6d9baa2498949ae47f0a001b42c639d2d9fc5b09 | |
| parent | ed0d0413b06ff9a257c27f786a63c9ae5a0cb95f (diff) | |
| download | scummvm-rg350-c0d3d5776e5fd976c4fd25c452c719bf5bd6d300.tar.gz scummvm-rg350-c0d3d5776e5fd976c4fd25c452c719bf5bd6d300.tar.bz2 scummvm-rg350-c0d3d5776e5fd976c4fd25c452c719bf5bd6d300.zip | |
SCI32: Limit existing bad audio map resource skips by language
Since audio maps change when game speech is localised, it makes
sense to limit audio map skips by language until it turns out that
the same problem exists in more than one language release, so we
do not accidentally skip a map that is bad in one language, but OK
in another language.
| -rw-r--r-- | engines/sci/resource_audio.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp index 9fd5dc00e6..3484a06395 100644 --- a/engines/sci/resource_audio.cpp +++ b/engines/sci/resource_audio.cpp @@ -482,13 +482,17 @@ int ResourceManager::readAudioMapSCI11(IntMapResourceSource *map) { // 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) { + if (g_sci->getGameId() == GID_PQSWAT && + g_sci->getLanguage() == Common::EN_ANY && + map->_volumeNumber == 1 && + map->_mapNumber == 405) { continue; } - // At least version 1.00 of GK2 has multiple invalid audio36 map - // entries on CD 6 + // At least version 1.00 of the US release of GK2 has multiple + // invalid audio36 map entries on CD 6 if (g_sci->getGameId() == GID_GK2 && + g_sci->getLanguage() == Common::EN_ANY && map->_volumeNumber == 6 && offset + syncSize >= srcSize) { |