[Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.47,1.48

Jamieson Christian jamieson630 at users.sourceforge.net
Sun May 25 14:43:02 CEST 2003


Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv27544/scummvm/simon

Modified Files:
	midi.cpp 
Log Message:
Fixed undefined file read operation

Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- midi.cpp	25 May 2003 10:14:21 -0000	1.47
+++ midi.cpp	25 May 2003 21:32:11 -0000	1.48
@@ -461,9 +461,9 @@
 	MusicInfo *p = sfx ? &_sfx : &_music;
 	clearConstructs (*p);
 
-	uint32 size = in->readByte() | (in->readByte() << 8);
+	uint16 size = in->readUint16LE();
 	if (size != in->size() - 2) {
-		printf ("ERROR! Size mismatch in simon1demo MUS file (%ld versus reported %ld)\n", (long) in->size() - 2, (long) size);
+		printf ("ERROR! Size mismatch in simon1demo MUS file (%ld versus reported %d)\n", (long) in->size() - 2, (int) size);
 		_system->unlock_mutex (_mutex);
 		return;
 	}





More information about the Scummvm-git-logs mailing list