aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2010-11-25 22:16:22 +0000
committerFilippos Karapetis2010-11-25 22:16:22 +0000
commit11ac03b7aba61570f54eaf06984a818f881a6166 (patch)
tree92bf20521ca5951eb52fe69b7ff65ef563ee622b /engines
parent1cf26f67e0298ae0f9ced6190c5f7a4e92ee6098 (diff)
downloadscummvm-rg350-11ac03b7aba61570f54eaf06984a818f881a6166.tar.gz
scummvm-rg350-11ac03b7aba61570f54eaf06984a818f881a6166.tar.bz2
scummvm-rg350-11ac03b7aba61570f54eaf06984a818f881a6166.zip
SCI: Global reverb can't be 127. Some cleanup
svn-id: r54482
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/sound/midiparser_sci.cpp15
1 files changed, 5 insertions, 10 deletions
diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp
index 60fe1255b7..ccd23f443a 100644
--- a/engines/sci/sound/midiparser_sci.cpp
+++ b/engines/sci/sound/midiparser_sci.cpp
@@ -500,16 +500,11 @@ void MidiParser_SCI::parseNextEvent(EventInfo &info) {
// http://wiki.scummvm.org/index.php/SCI/Specifications/Sound/SCI0_Resource_Format#Status_Reference
// Also, sci/sound/iterator/iterator.cpp, function BaseSongIterator::parseMidiCommand()
switch (info.basic.param1) {
- case kSetReverb: {
- MidiPlayer *driver = ((MidiPlayer *)_driver);
- if (info.basic.param2 == 127) { // Set global reverb instead
- byte globalReverb = _music->getGlobalReverb();
- if (globalReverb != 127)
- driver->setReverb(globalReverb);
- } else {
- driver->setReverb(info.basic.param2);
- }
- }
+ case kSetReverb:
+ if (info.basic.param2 == 127) // Set global reverb instead
+ ((MidiPlayer *)_driver)->setReverb(_music->getGlobalReverb());
+ else
+ ((MidiPlayer *)_driver)->setReverb(info.basic.param2);
break;
case kMidiHold:
// Check if the hold ID marker is the same as the hold ID