aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/resource_audio.cpp
diff options
context:
space:
mode:
authorColin Snover2016-09-15 09:05:20 -0500
committerColin Snover2016-09-29 19:39:16 -0500
commit0e53c8e9f3d54347b27e4628fcc1c15331f749d4 (patch)
treeb9865ccad6936ed090fd7c71cfb8eeafe854acf2 /engines/sci/resource_audio.cpp
parentb3cfe699f6b3cd9590a4f3b1e5ec2ef656b86dbb (diff)
downloadscummvm-rg350-0e53c8e9f3d54347b27e4628fcc1c15331f749d4.tar.gz
scummvm-rg350-0e53c8e9f3d54347b27e4628fcc1c15331f749d4.tar.bz2
scummvm-rg350-0e53c8e9f3d54347b27e4628fcc1c15331f749d4.zip
SCI32: Improve MGDX support
Audio directory switching is temporarily disabled because it causes use-after-free in the resource manager.
Diffstat (limited to 'engines/sci/resource_audio.cpp')
-rw-r--r--engines/sci/resource_audio.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp
index cbc4a02739..4b3a13c490 100644
--- a/engines/sci/resource_audio.cpp
+++ b/engines/sci/resource_audio.cpp
@@ -965,6 +965,10 @@ bool ResourceManager::addAudioSources() {
}
void ResourceManager::changeAudioDirectory(Common::String path) {
+ // TODO: This implementation is broken.
+ return;
+
+#if 0
// Remove all of the audio map resource sources, as well as the audio resource sources
for (Common::List<ResourceSource *>::iterator it = _sources.begin(); it != _sources.end();) {
ResourceSource *source = *it;
@@ -1007,6 +1011,7 @@ void ResourceManager::changeAudioDirectory(Common::String path) {
// Rescan the newly added resources
scanNewSources();
+#endif
}
} // End of namespace Sci