diff options
| author | Max Horn | 2003-12-12 15:28:44 +0000 |
|---|---|---|
| committer | Max Horn | 2003-12-12 15:28:44 +0000 |
| commit | 0b22651494f506ce53c250b7d1c1e6a81e9f4e1d (patch) | |
| tree | 1a3d0da162d8bb52821d0a419423e3ae78918e87 | |
| parent | 0ee89a32774585a36c6e6d739c7aee8ffcbd1de3 (diff) | |
| download | scummvm-rg350-0b22651494f506ce53c250b7d1c1e6a81e9f4e1d.tar.gz scummvm-rg350-0b22651494f506ce53c250b7d1c1e6a81e9f4e1d.tar.bz2 scummvm-rg350-0b22651494f506ce53c250b7d1c1e6a81e9f4e1d.zip | |
avoid accessing detector->_game.midi
svn-id: r11598
| -rw-r--r-- | simon/simon.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
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")) |