diff options
| author | Joost Peters | 2004-01-03 02:08:04 +0000 |
|---|---|---|
| committer | Joost Peters | 2004-01-03 02:08:04 +0000 |
| commit | 5f85df5ed6d28efb7f5327de8e09287ebe576662 (patch) | |
| tree | 16aa61a9ed5b071446d40043aa3dcf1a968d087e /queen/queen.cpp | |
| parent | b0e23e35ee7f0b7c080e821fd521e007dcd80a18 (diff) | |
| download | scummvm-rg350-5f85df5ed6d28efb7f5327de8e09287ebe576662.tar.gz scummvm-rg350-5f85df5ed6d28efb7f5327de8e09287ebe576662.tar.bz2 scummvm-rg350-5f85df5ed6d28efb7f5327de8e09287ebe576662.zip | |
Allow queen to use adlib driver as well (that was surprisingly easy :))
svn-id: r12100
Diffstat (limited to 'queen/queen.cpp')
| -rw-r--r-- | queen/queen.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/queen/queen.cpp b/queen/queen.cpp index d573a85c2c..c3d13f1f6f 100644 --- a/queen/queen.cpp +++ b/queen/queen.cpp @@ -168,13 +168,11 @@ void QueenEngine::initialise(void) { _input = new Input(_resource->getLanguage(), _system); _logic = new Logic(this); - int midiDriver = GameDetector::detectMusicDriver(MDT_NATIVE | MDT_ADLIB | MDT_PREFER_NATIVE); - if (midiDriver == MD_ADLIB) { - warning("Adlib music not supported, please use native MIDI if possible"); - midiDriver = MD_NULL; - } - - _music = new Music(GameDetector::createMidi(midiDriver), this); + MidiDriver *driver = GameDetector::createMidi(GameDetector::detectMusicDriver(MDT_NATIVE | MDT_ADLIB | MDT_PREFER_NATIVE)); + if (!driver) + driver = MidiDriver_ADLIB_create(_mixer); + + _music = new Music(driver, this); _sound = Sound::giveSound(_mixer, this, _resource->compression()); _walk = new Walk(this); _timer->installTimerProc(&timerHandler, 1000000 / 50, this); //call 50 times per second |