diff options
| author | Joost Peters | 2004-01-02 14:21:14 +0000 |
|---|---|---|
| committer | Joost Peters | 2004-01-02 14:21:14 +0000 |
| commit | e5ba3b172e6cb467978263e9646ba145b2dbc25d (patch) | |
| tree | 6d07715da5ec76b22c6ba4be622154c745f5d84f /queen | |
| parent | 5b97c9308d197b90581f9072dc87c112c5af6e1c (diff) | |
| download | scummvm-rg350-e5ba3b172e6cb467978263e9646ba145b2dbc25d.tar.gz scummvm-rg350-e5ba3b172e6cb467978263e9646ba145b2dbc25d.tar.bz2 scummvm-rg350-e5ba3b172e6cb467978263e9646ba145b2dbc25d.zip | |
Tell adlib people they won't hear music
svn-id: r12089
Diffstat (limited to 'queen')
| -rw-r--r-- | queen/queen.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/queen/queen.cpp b/queen/queen.cpp index 41491a12ed..d573a85c2c 100644 --- a/queen/queen.cpp +++ b/queen/queen.cpp @@ -44,6 +44,8 @@ #include "queen/talk.h" #include "queen/walk.h" +#include "sound/mididrv.h" + extern uint16 _debugLevel; #ifdef _WIN32_WCE @@ -165,7 +167,14 @@ void QueenEngine::initialise(void) { _graphics = new Graphics(this); _input = new Input(_resource->getLanguage(), _system); _logic = new Logic(this); - _music = new Music(GameDetector::createMidi(GameDetector::detectMusicDriver(MDT_NATIVE)), 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); _sound = Sound::giveSound(_mixer, this, _resource->compression()); _walk = new Walk(this); _timer->installTimerProc(&timerHandler, 1000000 / 50, this); //call 50 times per second |