[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.288,1.289

[Max Horn]

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

Modified Files:
	scumm.cpp 
Log Message:
Get rid of the useless & troublesome master_volume

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -d -r1.288 -r1.289
--- scumm.cpp	19 Dec 2004 12:46:12 -0000	1.288
+++ scumm.cpp	25 Dec 2004 23:43:05 -0000	1.289
@@ -1380,20 +1380,19 @@
 void ScummEngine::setupVolumes() {
 
 	// Sync the engine with the config manager
-	int soundVolumeMaster = ConfMan.getInt("master_volume");
 	int soundVolumeMusic = ConfMan.getInt("music_volume");
 	int soundVolumeSfx = ConfMan.getInt("sfx_volume");
 	int soundVolumeSpeech = ConfMan.getInt("speech_volume");
 
 	if (_musicEngine) {
-		_musicEngine->setMusicVolume(soundVolumeMusic * soundVolumeMaster / 255);
+		_musicEngine->setMusicVolume(soundVolumeMusic);
 	}
 
-	_mixer->setVolume(soundVolumeSfx * soundVolumeMaster / 255);
+	_mixer->setVolume(soundVolumeSfx);
 	_mixer->setMusicVolume(soundVolumeMusic);
 
 	if (_imuseDigital) {
-		_mixer->setVolume(soundVolumeMaster);
+		_mixer->setVolume(255);
 		_imuseDigital->setGroupMusicVolume(soundVolumeMusic / 2);
 		_imuseDigital->setGroupSfxVolume(soundVolumeSfx / 2);
 		_imuseDigital->setGroupVoiceVolume(soundVolumeSpeech / 2);