aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorPaweł Kołodziejski2004-01-12 19:32:44 +0000
committerPaweł Kołodziejski2004-01-12 19:32:44 +0000
commita60c66564b1a1a52f31769f9f24d9a8571468e24 (patch)
treec63ff78b7523225fbcfd8447c44d66ef5dd024a4 /scumm
parent278ea4808e5576d3a89a97689ccc36f6a0b5e622 (diff)
downloadscummvm-rg350-a60c66564b1a1a52f31769f9f24d9a8571468e24.tar.gz
scummvm-rg350-a60c66564b1a1a52f31769f9f24d9a8571468e24.tar.bz2
scummvm-rg350-a60c66564b1a1a52f31769f9f24d9a8571468e24.zip
- fix - proper place for stopallsound
- fix - correct fade value svn-id: r12347
Diffstat (limited to 'scumm')
-rw-r--r--scumm/imuse_digi/dimuse.cpp2
-rw-r--r--scumm/imuse_digi/dimuse_music.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp
index 2c1f2f10d5..f0bb0b4049 100644
--- a/scumm/imuse_digi/dimuse.cpp
+++ b/scumm/imuse_digi/dimuse.cpp
@@ -54,8 +54,8 @@ IMuseDigital::IMuseDigital(ScummEngine *scumm)
}
IMuseDigital::~IMuseDigital() {
- _vm->_timer->removeTimerProc(timer_handler);
stopAllSounds(true);
+ _vm->_timer->removeTimerProc(timer_handler);
delete _sound;
}
diff --git a/scumm/imuse_digi/dimuse_music.cpp b/scumm/imuse_digi/dimuse_music.cpp
index f4e3b48a0a..6c8c57b0ae 100644
--- a/scumm/imuse_digi/dimuse_music.cpp
+++ b/scumm/imuse_digi/dimuse_music.cpp
@@ -109,7 +109,7 @@ void IMuseDigital::fadeOutMusic() {
for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {
_track[l].locked = true;
if (_track[l].used) {
- parseScriptCmds(14, _track[l].soundId, 0x600, 0, 0x200, 0, 0, 0);
+ parseScriptCmds(14, _track[l].soundId, 0x600, 0, 200, 0, 0, 0);
}
_track[l].locked = false;
}