[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.283.2.1,1.283.2.2

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2034

Modified Files:
      Tag: release-0-7-0
	scumm.cpp 
Log Message:
Fix for bug #1087439 (Volume control regression)

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.283.2.1
retrieving revision 1.283.2.2
diff -u -d -r1.283.2.1 -r1.283.2.2
--- scumm.cpp	17 Dec 2004 18:01:23 -0000	1.283.2.1
+++ scumm.cpp	18 Dec 2004 11:08:13 -0000	1.283.2.2
@@ -1090,8 +1090,6 @@
 
 	if (_imuse) {
 		_imuse->setBase(res.address[rtSound]);
-
-		_imuse->setMusicVolume(ConfMan.getInt("music_volume"));
 	}
 	_sound->setupSound();
 
@@ -1376,12 +1374,8 @@
 	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);