aboutsummaryrefslogtreecommitdiff
path: root/queen/music.cpp
diff options
context:
space:
mode:
authorJoost Peters2004-01-27 23:05:02 +0000
committerJoost Peters2004-01-27 23:05:02 +0000
commit63be7c1323061db7f30897886c92b899814e0247 (patch)
tree27987aa27ce3e80ceb1221ae53fba2d7a2764256 /queen/music.cpp
parent829df83f79ce9af815ee4c9a208e2404c5ab9903 (diff)
downloadscummvm-rg350-63be7c1323061db7f30897886c92b899814e0247.tar.gz
scummvm-rg350-63be7c1323061db7f30897886c92b899814e0247.tar.bz2
scummvm-rg350-63be7c1323061db7f30897886c92b899814e0247.zip
Allow using a real MT-32 (can someone with one please test this?)
svn-id: r12641
Diffstat (limited to 'queen/music.cpp')
-rw-r--r--queen/music.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/queen/music.cpp b/queen/music.cpp
index 6ef7145a13..1e4b8e01d4 100644
--- a/queen/music.cpp
+++ b/queen/music.cpp
@@ -113,7 +113,7 @@ static const byte mt32_to_gm[128] = {
_channelVolume[channel] = volume;
//volume = volume * _masterVolume / 255;
b = (b & 0xFF00FFFF) | (volume << 16);
- } else if ((b & 0xF0) == 0xC0) {
+ } else if ((b & 0xF0) == 0xC0 && !_nativeMT32) {
b = (b & 0xFFFF00FF) | mt32_to_gm[(b >> 8) & 0xFF] << 8;
}
else if ((b & 0xFFF0) == 0x007BB0) {