[Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.4,1.5

Max Horn fingolfin at users.sourceforge.net
Mon Oct 21 15:05:01 CEST 2002


Update of /cvsroot/scummvm/scummvm/simon
In directory usw-pr-cvs1:/tmp/cvs-serv30164

Modified Files:
	midi.cpp 
Log Message:
fixed simon2win midi (I hope), bug #595813

Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- midi.cpp	21 Oct 2002 13:23:24 -0000	1.4
+++ midi.cpp	21 Oct 2002 22:03:59 -0000	1.5
@@ -79,11 +79,10 @@
 
 	for (i = 0; i != s->num_tracks; i++, t++) {
 		if (!old) {
-			uint32 foo = in->readUint32BE();
-			if (foo != 'MTrk')
-				error("Midi track has no 'MTrk' (%d, %08x)", i, foo);
+			if (in->readUint32BE() != 'MTrk')
+				error("Midi track has no 'MTrk'", i, foo);
 
-			t->data_size = in->readUint32LE();
+			t->data_size = in->readUint32BE();
 		} else {
 			uint32 pos = in->pos();
 			in->seek(0, SEEK_END);





More information about the Scummvm-git-logs mailing list