[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.cpp,1.99,1.100 boxes.cpp,1.5,1.6

[Jamieson Christian]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv26473/scummvm/scumm

Modified Files:
	gfx.cpp boxes.cpp 
Log Message:
Fixed VC++ warnings.

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- gfx.cpp	30 Dec 2002 14:04:46 -0000	1.99
+++ gfx.cpp	30 Dec 2002 14:22:23 -0000	1.100
@@ -945,7 +945,7 @@
 				else if (_vm->_features & GF_SMALL_HEADER)
 					offs = READ_LE_UINT16(zplane_list[i] + stripnr * 2 + 2);
 				else if (_vm->_features & GF_AFTER_V8)
-					offs = READ_LE_UINT32(zplane_list[i] + stripnr * 4 + 8);
+					offs = (uint16) READ_LE_UINT32(zplane_list[i] + stripnr * 4 + 8);
 				else
 					offs = READ_LE_UINT16(zplane_list[i] + stripnr * 2 + 8);
 

Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/boxes.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- boxes.cpp	30 Dec 2002 01:40:12 -0000	1.5
+++ boxes.cpp	30 Dec 2002 14:22:23 -0000	1.6
@@ -85,7 +85,7 @@
 		return 0;
 
 	if (_features & GF_AFTER_V8)
-		return FROM_LE_32(ptr->v8.mask);
+		return (byte) FROM_LE_32(ptr->v8.mask);
 	else
 		return ptr->old.mask;
 }
@@ -114,7 +114,7 @@
 	if (!ptr)
 		return 0;
 	if (_features & GF_AFTER_V8)
-		return FROM_LE_32(ptr->v8.flags);
+		return (byte) FROM_LE_32(ptr->v8.flags);
 	else
 		return ptr->old.flags;
 }
@@ -147,7 +147,7 @@
 	if (!ptr)
 		return 0;
 	if (_features & GF_AFTER_V8)
-		return READ_LE_UINT32(ptr);
+		return (byte) READ_LE_UINT32(ptr);
 	else
 		return ptr[0];
 }