[Scummvm-cvs-logs] CVS: scummvm-new/scumm sys.cpp,1.1.1.1,1.2 costume.cpp,1.1.1.1,1.2
Max Horn
fingolfin at users.sourceforge.net
Sat Aug 24 06:07:02 CEST 2002
Update of /cvsroot/scummvm/scummvm-new/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv6342/scumm
Modified Files:
sys.cpp costume.cpp
Log Message:
fixed some warnings
Index: sys.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/sys.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- sys.cpp 21 Aug 2002 16:07:36 -0000 1.1.1.1
+++ sys.cpp 24 Aug 2002 13:06:44 -0000 1.2
@@ -68,7 +68,7 @@
void Scumm::fileRead(void *file, void *ptr, uint32 size)
{
- byte *ptr2 = (byte *)ptr, *src;
+ byte *ptr2 = (byte *)ptr;
if (size == 0)
return;
@@ -86,7 +86,6 @@
int Scumm::fileReadByte()
{
byte b;
- byte *src;
if (fread(&b, 1, 1, (FILE *)_fileHandle) != 1) {
clearerr((FILE *)_fileHandle);
Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm-new/scumm/costume.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- costume.cpp 21 Aug 2002 16:07:27 -0000 1.1.1.1
+++ costume.cpp 24 Aug 2002 13:06:44 -0000 1.2
@@ -904,7 +904,7 @@
byte maskbit, len, height, pcolor, width;
int color, t;
uint y;
- uint oldXpos, oldScaleIndexX;
+ int oldXpos, oldScaleIndexX;
mask = _mask_ptr_dest;
dst = _backbuff_ptr;
@@ -968,7 +968,7 @@
byte maskbit, len, height, pcolor, width;
int color, t;
uint y;
- uint oldXpos, oldScaleIndexX;
+ int oldXpos, oldScaleIndexX;
mask = _mask_ptr_dest;
dst = _backbuff_ptr;
@@ -1034,7 +1034,7 @@
uint y;
int color;
int t, x;
- uint oldXpos, oldScaleIndexX;
+ int oldXpos, oldScaleIndexX;
mask = _mask_ptr = _mask_ptr_dest;
maskbit = revBitMask[_xpos & 7];
More information about the Scummvm-git-logs
mailing list