From ee3b511276027f4252ed21d6be487d1042a6f051 Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Tue, 19 Apr 2005 06:16:53 +0000 Subject: [PATCH] Add patch #1185667 - GS Fix svn-id: r17676 --- scumm/scumm.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index 8e4670dae3f..f59bbee5354 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -1687,7 +1687,8 @@ void ScummEngine_v99he::scummInit() { void ScummEngine::setupMusic(int midi) { _midiDriver = MidiDriver::detectMusicDriver(midi); _native_mt32 = (ConfMan.getBool("native_mt32") || (_midiDriver == MD_MT32)); - if ((_gameId == GID_TENTACLE) || (_gameId == GID_SAMNMAX)) + // FIXME: MD_TOWNS should not be _midi_native in the first place!! iMuse code needs to be restructured. + if ((_gameId == GID_TENTACLE) || (_gameId == GID_SAMNMAX) || (_midiDriver == MD_TOWNS)) _enable_gs = false; else _enable_gs = ConfMan.getBool("enable_gs");