aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJohannes Schickel2013-04-21 05:23:50 -0700
committerJohannes Schickel2013-04-21 05:23:50 -0700
commit9ffec86b5d612067f3f8a0a0126a3000c22965ff (patch)
tree928683e4ca5705c2b92f1a8525f266587802ec85 /engines
parent3a1de9a1828dccac216cc9833de0b8c06a681d07 (diff)
parent8d25c558910c1a2e14c32ace568121ab8c643b70 (diff)
downloadscummvm-rg350-9ffec86b5d612067f3f8a0a0126a3000c22965ff.tar.gz
scummvm-rg350-9ffec86b5d612067f3f8a0a0126a3000c22965ff.tar.bz2
scummvm-rg350-9ffec86b5d612067f3f8a0a0126a3000c22965ff.zip
Merge pull request #324 from eriktorbjorn/kyra-midifade
KYRA: Fix MIDI fade-out behaviour
Diffstat (limited to 'engines')
-rw-r--r--engines/kyra/sound_midi.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/kyra/sound_midi.cpp b/engines/kyra/sound_midi.cpp
index b93b42fa9c..fc6e92abd9 100644
--- a/engines/kyra/sound_midi.cpp
+++ b/engines/kyra/sound_midi.cpp
@@ -323,7 +323,7 @@ void MidiOutput::setSourceVolume(int source, int volume, bool apply) {
for (int i = 0; i < 16; ++i) {
// Controller 0 in the state table should always be '7' aka
// volume control
- byte realVol = (_channels[i].controllers[0].value * volume) >> 8;
+ byte realVol = (_sources[source].controllers[i][0].value * volume) >> 8;
sendIntern(0xB0, i, 0x07, realVol);
}
}