[Scummvm-cvs-logs] CVS: scummvm/scumm instrument.cpp,2.1,2.2 imuse.cpp,2.1,2.2

Jamieson Christian jamieson630 at users.sourceforge.net
Wed Dec 18 05:54:04 CET 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv28912/scummvm/scumm

Modified Files:
	instrument.cpp imuse.cpp 
Log Message:
Damn, I just fixed this a bit ago! *self-bonk*

Index: instrument.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/instrument.cpp,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -d -r2.1 -r2.2
--- instrument.cpp	18 Dec 2002 13:22:39 -0000	2.1
+++ instrument.cpp	18 Dec 2002 13:53:51 -0000	2.2
@@ -415,6 +415,7 @@
 void Instrument_Roland::send (MidiChannel *mc)
 {
 	if (NATIVE_MT32) { // if (mc->device()->mt32device()) {
+		_instrument.device_id = mc->getNumber();
 		mc->device()->sysEx ((byte *) &_instrument, sizeof (_instrument));
 	} else {
 		// Convert to a GM program change.

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -d -r2.1 -r2.2
--- imuse.cpp	18 Dec 2002 13:22:39 -0000	2.1
+++ imuse.cpp	18 Dec 2002 13:53:52 -0000	2.2
@@ -2134,7 +2134,6 @@
 			// Roland custom instrument definition.
 			part = get_part (p[0] & 0x0F);
 			if (part) {
-				p[0] = part->_mc->getNumber();
 				part->_instrument.roland (p - 1);
 				part->changed (IMuseDriver::pcProgram);
 			}





More information about the Scummvm-git-logs mailing list