[Scummvm-cvs-logs] CVS: scummvm gui.cpp,1.45,1.46 sound.cpp,1.84,1.85

[Nicolas Noble]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv28637

Modified Files:
	gui.cpp sound.cpp 
Log Message:
Closing bug #555104


Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- gui.cpp	12 May 2002 20:25:56 -0000	1.45
+++ gui.cpp	12 May 2002 21:39:19 -0000	1.46
@@ -594,9 +594,9 @@
 			imuse->set_music_volume(_s->_sound_volume_music);
 			imuse->set_master_volume(_s->_sound_volume_master);
 			_s->_mixer->set_volume(_s->_sound_volume_sfx);
-			scummcfg->set("master_volume", _s->_sound_volume_master, "scummvm");
-			scummcfg->set("music_volume", _s->_sound_volume_music, "scummvm");
-			scummcfg->set("sfx_volume", _s->_sound_volume_sfx, "scummvm");
+			scummcfg->set("master_volume", _s->_sound_volume_master);
+			scummcfg->set("music_volume", _s->_sound_volume_music);
+			scummcfg->set("sfx_volume", _s->_sound_volume_sfx);
 			scummcfg->flush();
 		}
 

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- sound.cpp	9 May 2002 03:51:51 -0000	1.84
+++ sound.cpp	12 May 2002 21:39:19 -0000	1.85
@@ -408,18 +408,18 @@
 	IMuse *se = _imuse;
 	if (se) {
 		se->setBase(res.address[rtSound]);
-		if (!scummcfg->get("music_volume", "scummvm"))
+		if (!scummcfg->get("music_volume"))
 			_sound_volume_music = 60;
 		else
-			_sound_volume_music = atoi(scummcfg->get("music_volume", "scummvm"));
-		if (!scummcfg->get("master_volume", "scummvm"))
+			_sound_volume_music = atoi(scummcfg->get("music_volume"));
+		if (!scummcfg->get("master_volume"))
 			_sound_volume_master = 125;
 		else
-			_sound_volume_master = atoi(scummcfg->get("master_volume", "scummvm"));			
-		if (!scummcfg->get("sfx_volume", "scummvm"))
+			_sound_volume_master = atoi(scummcfg->get("master_volume"));
+		if (!scummcfg->get("sfx_volume"))
 			_sound_volume_sfx = 100;
 		else
-			_sound_volume_sfx = atoi(scummcfg->get("sfx_volume", "scummvm"));
+			_sound_volume_sfx = atoi(scummcfg->get("sfx_volume"));
 
 		se->set_master_volume(_sound_volume_master);
 		se->set_music_volume(_sound_volume_music);