From 6dfb2f2dfd60fcc4beccb5013ae2bbd9eed736ad Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 18 Dec 2004 11:07:52 +0000
Subject: Fix for bug #1087439 (Volume control regression)

svn-id: r16113
---
 scumm/scumm.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'scumm')

diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index d3a5ad94d7..cbc0a06024 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -1090,8 +1090,6 @@ int ScummEngine::init(GameDetector &detector) {
 
 	if (_imuse) {
 		_imuse->setBase(res.address[rtSound]);
-
-		_imuse->setMusicVolume(ConfMan.getInt("music_volume"));
 	}
 	_sound->setupSound();
 
@@ -1376,12 +1374,8 @@ void ScummEngine::setupVolumes() {
 	int soundVolumeSfx = ConfMan.getInt("sfx_volume");
 	int soundVolumeSpeech = ConfMan.getInt("speech_volume");
 
-	if (_imuse) {
-		_imuse->setMusicVolume(soundVolumeMusic);
-	}
-
 	if (_musicEngine) {
-		_musicEngine->setMusicVolume(soundVolumeMusic);
+		_musicEngine->setMusicVolume(soundVolumeMusic * soundVolumeMaster / 255);
 	}
 
 	_mixer->setVolume(soundVolumeSfx * soundVolumeMaster / 255);
-- 
cgit v1.2.3