[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.12,1.13 string.cpp,1.19,1.20
Max Horn
fingolfin at users.sourceforge.net
Sat Sep 21 17:05:01 CEST 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.6,1.7
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush codec47.cpp,1.4,1.5 codec47.h,1.3,1.4 frenderer.cpp,1.7,1.8 player.cpp,1.15,1.16 scumm_renderer.cpp,1.10,1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv32394
Modified Files:
sound.cpp string.cpp
Log Message:
yet more warning fixes
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- sound.cpp 21 Sep 2002 13:48:03 -0000 1.12
+++ sound.cpp 22 Sep 2002 00:04:04 -0000 1.13
@@ -337,7 +337,6 @@
ptr += 0x16;
if (size == 30) {
- int result = 0;
int track = *ptr;
if (track == _scumm->current_cd_sound)
@@ -699,7 +698,7 @@
if (file_size > 0) {
data = (byte *)calloc(file_size + MAD_BUFFER_GUARD, 1);
- if (file->read(data, file_size) != file_size) {
+ if (file->read(data, file_size) != (uint)file_size) {
/* no need to free the memory since error will shut down */
error("startSfxSound: cannot read %d bytes", size);
return -1;
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- string.cpp 21 Sep 2002 16:20:52 -0000 1.19
+++ string.cpp 22 Sep 2002 00:04:04 -0000 1.20
@@ -1075,7 +1075,7 @@
number[2] = *(text + l + 3);
number[3] = 0;
num = atol(number);
- sprintf(num_s, "%d", num);
+ sprintf(num_s, "%ld", num);
char * buf = _languageBuffer;
// determine is file encoded
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm costume.cpp,1.6,1.7
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush codec47.cpp,1.4,1.5 codec47.h,1.3,1.4 frenderer.cpp,1.7,1.8 player.cpp,1.15,1.16 scumm_renderer.cpp,1.10,1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list