From 0b22651494f506ce53c250b7d1c1e6a81e9f4e1d Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Fri, 12 Dec 2003 15:28:44 +0000
Subject: avoid accessing detector->_game.midi

svn-id: r11598
---
 simon/simon.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'simon')

diff --git a/simon/simon.cpp b/simon/simon.cpp
index 4e21954a02..1e8a72661b 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -507,7 +507,11 @@ SimonEngine::SimonEngine(GameDetector *detector, OSystem *syst)
 	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"))
-- 
cgit v1.2.3