[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.28,1.29

[Pawel Kolodziejski]

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

Modified Files:
	object.cpp 
Log Message:
fixed warnings(errors) for VC6.
Endy I'm here now ! :-)

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- object.cpp	25 Dec 2002 04:30:23 -0000	1.28
+++ object.cpp	25 Dec 2002 07:48:37 -0000	1.29
@@ -407,7 +407,7 @@
 	roomhdr = (RoomHeader *)findResourceData(MKID('RMHD'), room);
 
 	if (_features & GF_AFTER_V8)
-		_numObjectsInRoom = READ_LE_UINT32(&(roomhdr->v8.numObjects));
+		_numObjectsInRoom = (byte)READ_LE_UINT32(&(roomhdr->v8.numObjects));
 	else if (_features & GF_AFTER_V7)
 		_numObjectsInRoom = READ_LE_UINT16(&(roomhdr->v7.numObjects));
 	else
@@ -594,11 +594,11 @@
 		od->parentstate = cdhd->v7.parentstate;
 
 		imhd = (ImageHeader *)findResourceData(MKID('IMHD'), room + od->offs_obim_to_room);
-		od->x_pos = READ_LE_UINT32(&imhd->v8.x_pos);
-		od->y_pos = READ_LE_UINT32(&imhd->v8.y_pos);
-		od->width = READ_LE_UINT32(&imhd->v8.width);
-		od->height = READ_LE_UINT32(&imhd->v8.height);
-		od->actordir = READ_LE_UINT32(&imhd->v8.actordir);
+		od->x_pos = (int)READ_LE_UINT32(&imhd->v8.x_pos);
+		od->y_pos = (int)READ_LE_UINT32(&imhd->v8.y_pos);
+		od->width = (uint)READ_LE_UINT32(&imhd->v8.width);
+		od->height = (uint)READ_LE_UINT32(&imhd->v8.height);
+		od->actordir = (byte)READ_LE_UINT32(&imhd->v8.actordir);
 
 	} else if (_features & GF_AFTER_V7) {
 		od->obj_nr = READ_LE_UINT16(&(cdhd->v7.obj_id));