[Scummvm-cvs-logs] SF.net SVN: scummvm:[54482] scummvm/trunk/engines/sci/sound/midiparser_sci. cpp

[thebluegr at users.sourceforge.net]

Revision: 54482
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54482&view=rev
Author:   thebluegr
Date:     2010-11-25 22:16:22 +0000 (Thu, 25 Nov 2010)

Log Message:
-----------
SCI: Global reverb can't be 127. Some cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sound/midiparser_sci.cpp

Modified: scummvm/trunk/engines/sci/sound/midiparser_sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/midiparser_sci.cpp	2010-11-25 22:14:38 UTC (rev 54481)
+++ scummvm/trunk/engines/sci/sound/midiparser_sci.cpp	2010-11-25 22:16:22 UTC (rev 54482)
@@ -500,16 +500,11 @@
 			// 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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.