[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.283,1.284

[Max Horn]

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

Modified Files:
	simon.cpp 
Log Message:
must create adlib driver *after* calling _mixer->bindToSystem

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -d -r1.283 -r1.284
--- simon.cpp	5 Aug 2003 23:58:23 -0000	1.283
+++ simon.cpp	6 Aug 2003 00:19:20 -0000	1.284
@@ -441,6 +441,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(_mixer);
@@ -450,13 +456,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;