aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorColin Snover2017-08-26 18:06:20 -0500
committerColin Snover2017-08-26 18:09:47 -0500
commitd7d75d97fda6992ef3cf53625445cc5586d7476b (patch)
treedc0f45b20ee2943e658488e1d22ecdd9ecf43aa7 /engines
parentb17c66981e0213fe1d437a14c724a02c9073dc94 (diff)
downloadscummvm-rg350-d7d75d97fda6992ef3cf53625445cc5586d7476b.tar.gz
scummvm-rg350-d7d75d97fda6992ef3cf53625445cc5586d7476b.tar.bz2
scummvm-rg350-d7d75d97fda6992ef3cf53625445cc5586d7476b.zip
SCI32: Ignore invalid audio maps in Phant2 FR
Fixes Trac#10049.
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/resource_audio.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp
index 08f5fb8891..ddaec1e971 100644
--- a/engines/sci/resource_audio.cpp
+++ b/engines/sci/resource_audio.cpp
@@ -511,6 +511,16 @@ int ResourceManager::readAudioMapSCI11(IntMapResourceSource *map) {
continue;
}
+ // Map 800 and 4176 contain content that was cut from the game. The
+ // French version of the game includes map files from the US
+ // release, but the audio resources are French so the maps don't
+ // match. Since the content was never used, just ignore these maps
+ // everywhere
+ if (g_sci->getGameId() == GID_PHANTASMAGORIA2 &&
+ (map->_mapNumber == 800 || map->_mapNumber == 4176)) {
+ continue;
+ }
+
addResource(id, src, offset + syncSize, 0, map->getLocationName());
}
}