[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.366,1.367

[Max Horn]

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

Modified Files:
	simon.cpp 
Log Message:
avoid accessing detector->_game.midi

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -d -r1.366 -r1.367
--- simon.cpp	12 Dec 2003 03:19:39 -0000	1.366
+++ simon.cpp	12 Dec 2003 15:28:44 -0000	1.367
@@ -507,7 +507,11 @@
 	set_volume(ConfMan.getInt("sfx_volume"));
 
 	// Setup midi driver
-	MidiDriver *driver = GameDetector::createMidi(GameDetector::detectMusicDriver(detector->_game.midi));
+	MidiDriver *driver = 0;
+	if (_game == GAME_SIMON1AMIGA || _game == GAME_SIMON1CD32)
+		driver = GameDetector::createMidi(MD_NULL);	// Create fake MIDI driver for Simon1Amiga and Simon2CD32 for now
+	else
+		driver = GameDetector::createMidi(GameDetector::detectMusicDriver(MDT_ADLIB | MDT_NATIVE));
 	if (!driver)
 		driver = MidiDriver_ADLIB_create(_mixer);
 	else if (ConfMan.getBool("native_mt32"))