aboutsummaryrefslogtreecommitdiff
path: root/scumm/imuse.cpp
diff options
context:
space:
mode:
authorMax Horn2003-03-25 00:28:09 +0000
committerMax Horn2003-03-25 00:28:09 +0000
commitb25a47ffc5727cbb4828ea51294d4aa747b0cb40 (patch)
tree109628814d5235eec649d8f050dcd6359c4c2d4e /scumm/imuse.cpp
parenta50bbdd7f78f77c48a4ed8467e59045c32e50ce8 (diff)
downloadscummvm-rg350-b25a47ffc5727cbb4828ea51294d4aa747b0cb40.tar.gz
scummvm-rg350-b25a47ffc5727cbb4828ea51294d4aa747b0cb40.tar.bz2
scummvm-rg350-b25a47ffc5727cbb4828ea51294d4aa747b0cb40.zip
Patch #691696: Possible fix for Adlib regression
svn-id: r6857
Diffstat (limited to 'scumm/imuse.cpp')
-rw-r--r--scumm/imuse.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp
index 0b2d5ab75b..97356f6117 100644
--- a/scumm/imuse.cpp
+++ b/scumm/imuse.cpp
@@ -1957,10 +1957,13 @@ byte *Player::parse_midi(byte *s) {
value = *s++;
part = get_part(chan);
if (part) {
- if (_isGM || value >= 32)
- part->set_program(value);
- else
- part->load_global_instrument (value);
+ if (_isGM) {
+ if (value < 128)
+ part->set_program(value);
+ } else {
+ if (value < 32)
+ part->load_global_instrument(value);
+ }
}
break;