aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorFilippos Karapetis2010-11-25 01:31:03 +0000
committerFilippos Karapetis2010-11-25 01:31:03 +0000
commitff58eea2ce7a00660dba3f3c6325a0709450c6e0 (patch)
tree689f82bb70812054baf7b92943fc755ab74d5a6a /engines/sci
parent75082609544bc64e3cb8d72e424f1fd81ff4126f (diff)
downloadscummvm-rg350-ff58eea2ce7a00660dba3f3c6325a0709450c6e0.tar.gz
scummvm-rg350-ff58eea2ce7a00660dba3f3c6325a0709450c6e0.tar.bz2
scummvm-rg350-ff58eea2ce7a00660dba3f3c6325a0709450c6e0.zip
SCI: Set _useMT32Track correctly for KQ5 Windows, thus simplifying the code
svn-id: r54465
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/sound/drivers/midi.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/engines/sci/sound/drivers/midi.cpp b/engines/sci/sound/drivers/midi.cpp
index 5e81d17df4..ba4e719c92 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;
- }
}
}