[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,2.57,2.58 imuse_internal.h,2.8,2.9

[Jamieson Christian]

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

Modified Files:
	imuse.cpp imuse_internal.h 
Log Message:
Fixed a MORONIC oob memory write. Now back to remedial C++ class

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.57
retrieving revision 2.58
diff -u -d -r2.57 -r2.58
--- imuse.cpp	26 May 2003 14:51:13 -0000	2.57
+++ imuse.cpp	26 May 2003 20:42:23 -0000	2.58
@@ -1161,8 +1161,7 @@
 			break;
 	}
 
-	if (ptr) {
-		ptr->midi = _midi_native ? _midi_native : _midi_adlib;
+	if (i) {
 		ptr->time_left = time * 10000;
 		ptr->a = a;
 		ptr->b = b;

Index: imuse_internal.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_internal.h,v
retrieving revision 2.8
retrieving revision 2.9
diff -u -d -r2.8 -r2.9
--- imuse_internal.h	25 May 2003 16:40:17 -0000	2.8
+++ imuse_internal.h	26 May 2003 20:42:25 -0000	2.9
@@ -129,7 +129,6 @@
 };
 
 struct DeferredCommand {
-	MidiDriver *midi;
 	uint32 time_left;
 	int a, b, c, d, e, f;
 	DeferredCommand() { memset (this, 0, sizeof (DeferredCommand)); }