diff options
| author | Max Horn | 2007-02-11 03:01:28 +0000 |
|---|---|---|
| committer | Max Horn | 2007-02-11 03:01:28 +0000 |
| commit | a6bd7be988f682aa359328ff8d22063bbb53f66d (patch) | |
| tree | bff90bf7e461298ab85f330da8391a8f3ed15948 /engines/scumm | |
| parent | 028d077e2b4296ac401e454eec11549c8fa81965 (diff) | |
| download | scummvm-rg350-a6bd7be988f682aa359328ff8d22063bbb53f66d.tar.gz scummvm-rg350-a6bd7be988f682aa359328ff8d22063bbb53f66d.tar.bz2 scummvm-rg350-a6bd7be988f682aa359328ff8d22063bbb53f66d.zip | |
Patch #1186858 (GM/GS/MT-32 Init Patch) -- slightly adapted to apply to current SVN
svn-id: r25483
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/scumm.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index c191f74a7a..64bdf42f0f 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1518,8 +1518,8 @@ void ScummEngine::setupMusic(int midi) { break; } - // FIXME: MD_TOWNS should not be _midi_native in the first place!! iMuse code needs to be restructured. - if ((_game.id == GID_TENTACLE) || (_game.id == GID_SAMNMAX) || (midiDriver == MD_TOWNS)) + // DOTT + SAM use General MIDI, so they shouldn't use GS settings + if ((_game.id == GID_TENTACLE) || (_game.id == GID_SAMNMAX)) _enable_gs = false; else _enable_gs = ConfMan.getBool("enable_gs"); @@ -1577,8 +1577,12 @@ void ScummEngine::setupMusic(int midi) { _imuse->property(IMuse::PROP_GAME_ID, _game.id); if (ConfMan.hasKey("tempo")) _imuse->property(IMuse::PROP_TEMPO_BASE, ConfMan.getInt("tempo")); - _imuse->property(IMuse::PROP_NATIVE_MT32, _native_mt32); - _imuse->property(IMuse::PROP_GS, _enable_gs); + // YM2162 driver can't handle midi->getPercussionChannel(), NULL shouldn't init MT-32/GM/GS + if ((midi != MDT_TOWNS) && (midi != MDT_NONE)) { + _imuse->property(IMuse::PROP_NATIVE_MT32, _native_mt32); + if (midiDriver != MD_MT32) // MT-32 Emulation shouldn't be GM/GS initialized + _imuse->property(IMuse::PROP_GS, _enable_gs); + } if (_game.heversion >= 60 || midi == MDT_TOWNS) { _imuse->property(IMuse::PROP_LIMIT_PLAYERS, 1); _imuse->property(IMuse::PROP_RECYCLE_PLAYERS, 1); |