[Scummvm-cvs-logs] CVS: scummvm/sound voc.cpp,1.3,1.4

Max Horn fingolfin at users.sourceforge.net
Fri Dec 26 05:15:00 CET 2003


Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv14524

Modified Files:
	voc.cpp 
Log Message:
fix warning, add TODO comment

Index: voc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/voc.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- voc.cpp	26 Dec 2003 12:15:23 -0000	1.3
+++ voc.cpp	26 Dec 2003 13:14:03 -0000	1.4
@@ -83,6 +83,10 @@
 	SOUND_HEADER_BIG_SIZE = 26 + 8
 };
 
+// FIXME/TODO: loadVocSample() essentially duplicates all the code from
+// readCreativeVoc(). Obviously this is bad, it should rather use that function
+// (after some tweaks to readCreativeVoc, to deal with the alternate VTLK
+// header).
 byte *loadVocSample(File *file, int32 &size, int &rate) {
 	char ident[8];
 
@@ -121,7 +125,7 @@
 		error("loadVocSample: out of memory");
 	}
 
-	if (file->read(data, size) != size) {
+	if ((int)file->read(data, size) != size) {
 		/* no need to free the memory since error will shut down */
 		error("startSfxSound: cannot read %d bytes", size);
 	}





More information about the Scummvm-git-logs mailing list