From a60c66564b1a1a52f31769f9f24d9a8571468e24 Mon Sep 17 00:00:00 2001
From: Paweł Kołodziejski
Date: Mon, 12 Jan 2004 19:32:44 +0000
Subject: - fix - proper place for stopallsound - fix - correct fade value

svn-id: r12347
---
 scumm/imuse_digi/dimuse.cpp       | 2 +-
 scumm/imuse_digi/dimuse_music.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'scumm')

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;
 	}
-- 
cgit v1.2.3