From ff58eea2ce7a00660dba3f3c6325a0709450c6e0 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Thu, 25 Nov 2010 01:31:03 +0000 Subject: [PATCH] SCI: Set _useMT32Track correctly for KQ5 Windows, thus simplifying the code svn-id: r54465 --- engines/sci/sound/drivers/midi.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/engines/sci/sound/drivers/midi.cpp b/engines/sci/sound/drivers/midi.cpp index 5e81d17df42..ba4e719c928 100644 --- a/engines/sci/sound/drivers/midi.cpp +++ b/engines/sci/sound/drivers/midi.cpp @@ -841,8 +841,10 @@ int MidiPlayer_Midi::open(ResourceManager *resMan) { } // Don't do any mapping for the Windows version of KQ5CD - if (g_sci && g_sci->getGameId() == GID_KQ5 && g_sci->getPlatform() == Common::kPlatformWindows) + if (g_sci && g_sci->getGameId() == GID_KQ5 && g_sci->getPlatform() == Common::kPlatformWindows) { + _useMT32Track = false; return 0; + } Resource *res = NULL; @@ -967,15 +969,10 @@ byte MidiPlayer_Midi::getPlayId() const { case SCI_VERSION_0_LATE: return 0x01; default: - if (_isMt32) { + if (_isMt32) return 0x0c; - } else { - // Use the GM play mask for the Windows version of KQ5CD. - if (g_sci && g_sci->getGameId() == GID_KQ5 && g_sci->getPlatform() == Common::kPlatformWindows) - return 0x07; - + else return _useMT32Track ? 0x0c : 0x07; - } } }