aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2005-04-19 06:16:53 +0000
committerTravis Howell2005-04-19 06:16:53 +0000
commitee3b511276027f4252ed21d6be487d1042a6f051 (patch)
tree479675782cd6ec0fb938b96eeee7813ff2630b4b
parentf3129c261a9f31b0501650725c6c30415b5bd368 (diff)
downloadscummvm-rg350-ee3b511276027f4252ed21d6be487d1042a6f051.tar.gz
scummvm-rg350-ee3b511276027f4252ed21d6be487d1042a6f051.tar.bz2
scummvm-rg350-ee3b511276027f4252ed21d6be487d1042a6f051.zip
Add patch #1185667 - GS Fix
svn-id: r17676
-rw-r--r--scumm/scumm.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 8e4670dae3..f59bbee535 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");