diff options
| author | Torbjörn Andersson | 2006-08-01 07:44:38 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2006-08-01 07:44:38 +0000 |
| commit | afe26b5ea5cb35c68da4db510a134df47a81814b (patch) | |
| tree | 8c2e6acfe83a997ad2da4202711b9caf4163edd4 | |
| parent | c32c7e00c4e1d8688a4aa548d41c623acdb8ba3d (diff) | |
| download | scummvm-rg350-afe26b5ea5cb35c68da4db510a134df47a81814b.tar.gz scummvm-rg350-afe26b5ea5cb35c68da4db510a134df47a81814b.tar.bz2 scummvm-rg350-afe26b5ea5cb35c68da4db510a134df47a81814b.zip | |
Until the native Kyra 2 Adlib music is supported, enable the automagic MIDI-to-
Adlib converter.
svn-id: r23651
| -rw-r--r-- | engines/kyra/kyra.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/kyra/kyra.cpp b/engines/kyra/kyra.cpp index 852731348a..b650aa61c5 100644 --- a/engines/kyra/kyra.cpp +++ b/engines/kyra/kyra.cpp @@ -141,7 +141,10 @@ int KyraEngine::init() { // for now we prefer Adlib over native MIDI int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB/* | MDT_PREFER_MIDI*/); - if (midiDriver == MD_ADLIB) { + // TODO: We should play the native Kyra 2 Adlib music, but until that + // is support, we'll use the automagic MIDI -> Adlib converter. + + if (midiDriver == MD_ADLIB && _game == GI_KYRA1) { _sound = new SoundAdlibPC(_mixer, this); assert(_sound); } else { @@ -162,7 +165,7 @@ int KyraEngine::init() { // missing. It's just that at least at the time of writing they // decidedly inferior to the Adlib ones. - if (ConfMan.getBool("multi_midi")) { + if (midiDriver != MD_ADLIB && ConfMan.getBool("multi_midi")) { SoundAdlibPC *adlib = new SoundAdlibPC(_mixer, this); assert(adlib); |