diff options
| -rw-r--r-- | scumm/imuse_digi/dimuse_script.cpp | 6 | ||||
| -rw-r--r-- | scumm/insane/insane_scenes.cpp | 1 | ||||
| -rw-r--r-- | scumm/sound.cpp | 4 |
3 files changed, 2 insertions, 9 deletions
diff --git a/scumm/imuse_digi/dimuse_script.cpp b/scumm/imuse_digi/dimuse_script.cpp index cc55827f99..62a343e30d 100644 --- a/scumm/imuse_digi/dimuse_script.cpp +++ b/scumm/imuse_digi/dimuse_script.cpp @@ -388,12 +388,6 @@ void IMuseDigital::stopAllSounds() { } void IMuseDigital::pause(bool p) { - for (int l = 0; l < MAX_DIGITAL_TRACKS + MAX_DIGITAL_FADETRACKS; l++) { - Track *track = _track[l]; - if (track->used) { - _vm->_mixer->pauseHandle(track->handle, p); - } - } _pause = p; } diff --git a/scumm/insane/insane_scenes.cpp b/scumm/insane/insane_scenes.cpp index 4059b25283..c2f9d1d795 100644 --- a/scumm/insane/insane_scenes.cpp +++ b/scumm/insane/insane_scenes.cpp @@ -136,7 +136,6 @@ void Insane::runScene(int arraynum) { } putActors(); - _vm->_sound->pauseSounds(0); // IMUSE_Resume(); _enemy[EN_ROTT3].maxdamage = 120; _insaneIsRunning = false; diff --git a/scumm/sound.cpp b/scumm/sound.cpp index 60854c57be..ad790fef57 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -914,12 +914,12 @@ void Sound::pauseSounds(bool pause) { _soundsPaused = pause; - _vm->_mixer->pauseAll(pause); - if (_vm->_imuseDigital) { _vm->_imuseDigital->pause(pause); } + _vm->_mixer->pauseAll(pause); + if ((_vm->_features & GF_AUDIOTRACKS) && _vm->VAR(_vm->VAR_MUSIC_TIMER) > 0) { if (pause) stopCDTimer(); |