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

[m_kiewitz at users.sourceforge.net]

Revision: 49924
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49924&view=rev
Author:   m_kiewitz
Date:     2010-06-17 11:05:39 +0000 (Thu, 17 Jun 2010)

Log Message:
-----------
SCI: decreasing channel given to us on cmdSendMidi by one, so mute command now matches the right channel. sierra sci also decreased by one (their channel is 1-based)

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

Modified: scummvm/trunk/engines/sci/sound/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-06-17 08:55:08 UTC (rev 49923)
+++ scummvm/trunk/engines/sci/sound/soundcmd.cpp	2010-06-17 11:05:39 UTC (rev 49924)
@@ -232,6 +232,10 @@
 		uint16 controller = argv[4].toUint16();
 		uint16 param = argv[5].toUint16();
 
+		if (!channel)
+			error("invalid channel specified on cmdSendMidi");
+		channel--; // channel is given 1-based, we are using 0-based
+
 		_midiCommand = (channel | midiCmd) | ((uint32)controller << 8) | ((uint32)param << 16);
 	}
 


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