[Scummvm-cvs-logs] CVS: scummvm/sound voc.cpp,1.6,1.7
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sat Dec 27 21:14:01 CET 2003
Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv539/sound
Modified Files:
voc.cpp
Log Message:
fixed compilation
Index: voc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/voc.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- voc.cpp 27 Dec 2003 14:10:45 -0000 1.6
+++ voc.cpp 27 Dec 2003 18:29:21 -0000 1.7
@@ -26,7 +26,7 @@
#include "sound/voc.h"
-byte *readVOCFromMemory(byte *ptr, int32 &size, int &rate, int32 &loops) {
+byte *readVOCFromMemory(byte *ptr, int &size, int &rate, int &loops) {
assert(strncmp((char *)ptr, "Creative Voice File\x1A", 20) == 0);
int32 offset = READ_LE_UINT16(ptr + 20);
@@ -92,7 +92,7 @@
// readCreativeVoc(). Obviously this is bad, it should rather use that function
// (after some tweaks to readCreativeVoc, to deal with the alternate VTLK
// header).
-byte *loadVOCFile(File *file, int32 &size, int &rate) {
+byte *loadVOCFile(File *file, int &size, int &rate) {
char ident[8];
if (file->read(ident, 8) != 8)
More information about the Scummvm-git-logs
mailing list