diff options
| author | Johannes Schickel | 2008-04-10 19:02:17 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-04-10 19:02:17 +0000 |
| commit | c13f2a73a36110beea710223097056b9a3d6b2f4 (patch) | |
| tree | 0896718eec1070fd8e133f46dfcc33ebda0d6131 /engines | |
| parent | 453d40c4056a61a49c0fa80148ed6bbc370585f9 (diff) | |
| download | scummvm-rg350-c13f2a73a36110beea710223097056b9a3d6b2f4.tar.gz scummvm-rg350-c13f2a73a36110beea710223097056b9a3d6b2f4.tar.bz2 scummvm-rg350-c13f2a73a36110beea710223097056b9a3d6b2f4.zip | |
Small fix related to all notes off event.
svn-id: r31468
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/kyra/sound.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index 79ced963f4..d3228b9b31 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -259,7 +259,7 @@ void SoundMidiPC::send(uint32 b) { return; } - const uint8 volume = /*_eventFromMusic ? */_musicVolume/* : _sfxVolume*/; + const int volume = /*_eventFromMusic ? */_musicVolume/* : _sfxVolume*/; uint8 channel = (byte)(b & 0x0F); if (((b & 0xFFF0) == 0x6FB0 || (b & 0xFFF0) == 0x6EB0) && channel != 9) { @@ -280,11 +280,11 @@ void SoundMidiPC::send(uint32 b) { vol = vol * volume / 255; b = (b & 0xFF00FFFF) | (vol << 16); } else if ((b & 0xF0) == 0xC0 && !_nativeMT32 && !_useC55) { - b = (b & 0xFFFF00FF) | MidiDriver::_mt32ToGm[(b >> 8) & 0xFF] << 8; + b = (b & 0xFFFF00FF) | (MidiDriver::_mt32ToGm[(b >> 8) & 0xFF] << 8); } else if ((b & 0xFFF0) == 0x007BB0) { //Only respond to All Notes Off if this channel //has currently been allocated - if (!_channel[channel]) + if (!_channel[_virChannel[channel]]) return; } |