aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWalter van Niftrik2010-02-02 01:36:45 +0000
committerWalter van Niftrik2010-02-02 01:36:45 +0000
commit5f7c5185427520547b28bce29642aa89ac8ce361 (patch)
tree806ba0351c585fb8794d141552b9ad66955aad22
parent6f66286c5934545d6fcd1b200953b3fa761d8848 (diff)
downloadscummvm-rg350-5f7c5185427520547b28bce29642aa89ac8ce361.tar.gz
scummvm-rg350-5f7c5185427520547b28bce29642aa89ac8ce361.tar.bz2
scummvm-rg350-5f7c5185427520547b28bce29642aa89ac8ce361.zip
SCI: Fix bug in keyshift handling in midi driver.
svn-id: r47806
-rw-r--r--engines/sci/sound/drivers/midi.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/sci/sound/drivers/midi.cpp b/engines/sci/sound/drivers/midi.cpp
index 8e65cb96d5..4150ae7ce7 100644
--- a/engines/sci/sound/drivers/midi.cpp
+++ b/engines/sci/sound/drivers/midi.cpp
@@ -156,7 +156,7 @@ void MidiPlayer_Midi::noteOn(int channel, int note, int velocity) {
// Scale velocity;
velocity = velocity * _percussionVelocityScale[note] / 127;
} else {
- int8 keyshift = _keyShift[channel];
+ int8 keyshift = _channels[channel].keyShift;
int shiftNote = note + keyshift;
@@ -687,8 +687,7 @@ void MidiPlayer_Midi::mapMt32ToGm(byte *data, size_t size) {
}
}
- // This is commented out as it seems to do more harm than good
- // _keyShift[i] = CLIP<uint8>(keyshift, 0, 48) - 24;
+ _keyShift[i] = CLIP<uint8>(keyshift, 0, 48) - 24;
_pitchBendRange[i] = CLIP<uint8>(bender_range, 0, 24);
}