[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.64,2.65 sound.cpp,1.99,1.100

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv31474/scumm

Modified Files:
	scummvm.cpp sound.cpp 
Log Message:
make the volume controls in the global options dialog work

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.64
retrieving revision 2.65
diff -u -d -r2.64 -r2.65
--- scummvm.cpp	18 Mar 2003 16:13:51 -0000	2.64
+++ scummvm.cpp	25 Mar 2003 15:55:25 -0000	2.65
@@ -216,7 +216,7 @@
 	_sound = new Sound(this);
 	_timer = Engine::_timer;
 
-	_sound->_sound_volume_master = 0;
+	_sound->_sound_volume_master = detector->_master_volume;
 	_sound->_sound_volume_sfx = detector->_sfx_volume;	
 	_sound->_sound_volume_music = detector->_music_volume;	
 

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- sound.cpp	23 Mar 2003 13:14:54 -0000	1.99
+++ sound.cpp	25 Mar 2003 15:55:27 -0000	1.100
@@ -720,10 +720,6 @@
 	if (_scumm->_imuse) {
 		_scumm->_imuse->setBase(_scumm->res.address[rtSound]);
 
-		_sound_volume_music = g_config->getInt("music_volume", kDefaultMusicVolume);
-		_sound_volume_master = g_config->getInt("master_volume", kDefaultMasterVolume);
-		_sound_volume_sfx = g_config->getInt("sfx_volume", kDefaultSFXVolume);
-
 		_scumm->_imuse->set_master_volume(_sound_volume_master);
 		_scumm->_imuse->set_music_volume(_sound_volume_music);
 		_scumm->_mixer->setVolume(_sound_volume_sfx * _sound_volume_master / 255);