aboutsummaryrefslogtreecommitdiff
path: root/scumm/saveload.cpp
diff options
context:
space:
mode:
authorPaweł Kołodziejski2002-10-15 06:53:42 +0000
committerPaweł Kołodziejski2002-10-15 06:53:42 +0000
commit45b1a8ea4563536b221c75c260b2b83b43bf3737 (patch)
tree72ca1cfce24d9ad6cf356e90ebd7148f9202dd21 /scumm/saveload.cpp
parent3fb3f65a1877c7ce607c455bd10557d79a6dc2bb (diff)
downloadscummvm-rg350-45b1a8ea4563536b221c75c260b2b83b43bf3737.tar.gz
scummvm-rg350-45b1a8ea4563536b221c75c260b2b83b43bf3737.tar.bz2
scummvm-rg350-45b1a8ea4563536b221c75c260b2b83b43bf3737.zip
cleanup sfx and music in imuse, changed talkdelay description(disable) in the dig
svn-id: r5148
Diffstat (limited to 'scumm/saveload.cpp')
-rw-r--r--scumm/saveload.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp
index bdbdb03516..f1d07c1383 100644
--- a/scumm/saveload.cpp
+++ b/scumm/saveload.cpp
@@ -115,6 +115,8 @@ bool Scumm::loadState(int slot, bool compat)
_imuseDigital->stopAll();
}
+ _sound->stopBundleMusic();
+
_sound->pauseSounds(true);
CHECK_HEAP openRoom(-1);
@@ -614,8 +616,13 @@ void Scumm::saveOrLoad(Serializer *s)
int var120Backup;
int var98Backup;
- if (_mixer && !s->isSaving())
- _mixer->stopAll();
+ if (_mixer && !s->isSaving()) {
+ if (_imuseDigital) {
+ _imuseDigital->stopAll();
+ } else {
+ _mixer->stopAll();
+ }
+ }
if (_current_version == VER_V9)
s->saveLoadEntries(this, mainEntriesV9);