diff options
| author | Jamieson Christian | 2003-10-08 11:31:47 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-10-08 11:31:47 +0000 |
| commit | 91fc9accbb1b7bf4a09baacd9bef35cc6fdfc39f (patch) | |
| tree | d8a12799e53b67ba67b1c3a3e5370c418c158320 /scumm | |
| parent | 2be56b398513bc1d416c6bc509356cc5f29a35f1 (diff) | |
| download | scummvm-rg350-91fc9accbb1b7bf4a09baacd9bef35cc6fdfc39f.tar.gz scummvm-rg350-91fc9accbb1b7bf4a09baacd9bef35cc6fdfc39f.tar.bz2 scummvm-rg350-91fc9accbb1b7bf4a09baacd9bef35cc6fdfc39f.zip | |
Fixed Indy4-Towns music settings, plus small multi-midi quirk
svn-id: r10680
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/scummvm.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 42cd04c7a7..a7c7f2a665 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -123,9 +123,9 @@ static const TargetSettings scumm_settings[] = { GF_USE_KEY, 0}, {"mi2demo", "Monkey Island 2: LeChuck's revenge (Demo)", GID_MONKEY2, 5, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE, GF_USE_KEY, 0}, - {"indydemo", "Indiana Jones and the Fate of Atlantis (FM Towns Demo)", GID_INDY4, 5, MDT_TOWNS, + {"indydemo", "Indiana Jones and the Fate of Atlantis (FM Towns Demo)", GID_INDY4, 5, MDT_ADLIB, GF_USE_KEY, 0}, - {"indy4", "Indiana Jones and the Fate of Atlantis (FM Towns)", GID_INDY4, 5, MDT_TOWNS, + {"indy4", "Indiana Jones and the Fate of Atlantis (FM Towns)", GID_INDY4, 5, MDT_ADLIB, GF_USE_KEY, 0}, {"atlantis", "Indiana Jones and the Fate of Atlantis", GID_INDY4, 5, /*MDT_PCSPK |*/ MDT_ADLIB | MDT_NATIVE, GF_USE_KEY, 0}, @@ -688,7 +688,8 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst) if (detector->_gameTempo != 0) _imuse->property(IMuse::PROP_TEMPO_BASE, detector->_gameTempo); _imuse->property(IMuse::PROP_OLD_ADLIB_INSTRUMENTS, (_features & GF_SMALL_HEADER) ? 1 : 0); - _imuse->property(IMuse::PROP_MULTI_MIDI, detector->_multi_midi && _midiDriver != MD_NULL); + _imuse->property(IMuse::PROP_MULTI_MIDI, detector->_multi_midi && + _midiDriver != MD_NULL && (detector->_game.midi & MDT_ADLIB)); _imuse->property(IMuse::PROP_NATIVE_MT32, detector->_native_mt32); if (_features & GF_HUMONGOUS || _features & GF_FMTOWNS) { _imuse->property(IMuse::PROP_LIMIT_PLAYERS, 1); |