aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2010-06-12 11:43:30 +0000
committerFilippos Karapetis2010-06-12 11:43:30 +0000
commit6fa4d1ba805237cd44f6c64cf1088988c5d652f8 (patch)
tree353e31b3afbe41dcffa6b4378823d96c49c536d4
parentf4739f9f68026d5e3ea3304777260cef3101a031 (diff)
downloadscummvm-rg350-6fa4d1ba805237cd44f6c64cf1088988c5d652f8.tar.gz
scummvm-rg350-6fa4d1ba805237cd44f6c64cf1088988c5d652f8.tar.bz2
scummvm-rg350-6fa4d1ba805237cd44f6c64cf1088988c5d652f8.zip
Initialize compression-related variables when loading external patch files. Fixes Cassima's speech in the intro of KQ6 (the engine thought that the external patch files of her speech were compressed)
svn-id: r49606
-rw-r--r--engines/sci/resource.cpp4
-rw-r--r--engines/sci/resource_audio.cpp2
2 files changed, 6 insertions, 0 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 0b7badb8f7..05aae0a39e 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -1230,6 +1230,8 @@ void ResourceManager::readResourcePatchesBase36(ResourceSource *source) {
psrcPatch->source_type = kSourcePatch;
psrcPatch->location_name = name;
psrcPatch->resourceFile = 0;
+ psrcPatch->audioCompressionType = 0;
+ psrcPatch->audioCompressionOffsetMapping = NULL;
processPatch(psrcPatch, (ResourceType)i, resourceNr, resource36.tuple);
}
}
@@ -1281,6 +1283,8 @@ void ResourceManager::readResourcePatches(ResourceSource *source) {
psrcPatch->source_type = kSourcePatch;
psrcPatch->location_name = name;
psrcPatch->resourceFile = 0;
+ psrcPatch->audioCompressionType = 0;
+ psrcPatch->audioCompressionOffsetMapping = NULL;
processPatch(psrcPatch, (ResourceType)i, resourceNr);
}
}
diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp
index 861866edc0..0e60239331 100644
--- a/engines/sci/resource_audio.cpp
+++ b/engines/sci/resource_audio.cpp
@@ -158,6 +158,8 @@ void ResourceManager::addNewGMPatch(const Common::String &gameId) {
psrcPatch->source_type = kSourcePatch;
psrcPatch->resourceFile = 0;
psrcPatch->location_name = gmPatchFile;
+ psrcPatch->audioCompressionType = 0;
+ psrcPatch->audioCompressionOffsetMapping = NULL;
processPatch(psrcPatch, kResourceTypePatch, 4);
}
}