[Scummvm-cvs-logs] CVS: scummvm gameDetector.cpp,1.51,1.52 scummvm.cpp,1.133,1.134

[James Brown]

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

Modified Files:
	gameDetector.cpp scummvm.cpp 
Log Message:
REALLY fix -m. For sure. Trust me. :)



Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gameDetector.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- gameDetector.cpp	3 May 2002 17:42:34 -0000	1.51
+++ gameDetector.cpp	3 May 2002 18:05:33 -0000	1.52
@@ -463,6 +463,7 @@
 	_gfx_mode = GFX_NORMAL;
 #endif
 	_sfx_volume = 100;
+	_music_volume = 60;
 
 #if defined(USE_NULL_DRIVER)
 	_gfx_driver = GD_NULL;
@@ -493,7 +494,7 @@
 #else
 	_saveconfig = false;
 	updateconfig();
-	parseCommandLine(argc, argv);
+	parseCommandLine(argc, argv);	
 #endif
 
 	if (_exe_name == NULL) {

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- scummvm.cpp	3 May 2002 17:53:38 -0000	1.133
+++ scummvm.cpp	3 May 2002 18:05:33 -0000	1.134
@@ -1395,7 +1395,8 @@
 		imuse->property(IMuse::PROP_MT32_EMULATE, detector->_mt32emulate);
 		if (detector->_gameTempo != 0)
 			imuse->property(IMuse::PROP_TEMPO_BASE, detector->_gameTempo);
-					
+		
+		imuse->set_music_volume(scumm->_sound_volume_music);
 		scumm->_imuse = imuse;
 	}