[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.260.2.6,1.260.2.7

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv22954/simon

Modified Files:
      Tag: branch-0-5-0
	simon.cpp 
Log Message:

backport simon adlib fix


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.260.2.6
retrieving revision 1.260.2.7
diff -u -d -r1.260.2.6 -r1.260.2.7
--- simon.cpp	4 Aug 2003 05:56:24 -0000	1.260.2.6
+++ simon.cpp	6 Aug 2003 13:44:19 -0000	1.260.2.7
@@ -442,6 +442,12 @@
 		"\x5\x5\x4\x6\x5\x3\x4\x5\x6\x3\x5\x5\x4\x6\x5\x3\x4\x6\x5\x6\x6\x6\x5\x5\x5\x6\x5\x6\x6\x6\x6\x6", 32);
 
 
+	// Setup mixer
+	if (!_mixer->bindToSystem(syst))
+		warning("Sound initialization failed. "
+						"Features of the game that depend on sound synchronization will most likely break");
+	set_volume(detector->_sfx_volume);
+
 	// Setup midi driver
 	if (!driver)
 		driver = MidiDriver_ADLIB_create();
@@ -451,13 +457,7 @@
 	int ret = midi.open();
 	if (ret)
 		warning ("MIDI Player init failed: \"%s\"", midi.getErrorName (ret));
-
-	// Setup mixer
-	if (!_mixer->bindToSystem(syst))
-		warning("Sound initialization failed. "
-						"Features of the game that depend on sound synchronization will most likely break");
 	midi.set_volume(detector->_music_volume);
-	set_volume(detector->_sfx_volume);
 
 	_debugMode = detector->_debugMode;
 	_debugLevel = detector->_debugLevel;