[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.120,1.121 object.cpp,1.123,1.124

[Jamieson Christian]

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

Modified Files:
	script_v5.cpp object.cpp 
Log Message:
Fixed MSVC warnings

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- script_v5.cpp	18 Jun 2003 12:33:46 -0000	1.120
+++ script_v5.cpp	18 Jun 2003 22:35:03 -0000	1.121
@@ -1922,7 +1922,7 @@
 		if (_features & GF_OLD_BUNDLE)
 			offset = *(objptr + 16);
 		else
-			offset = READ_LE_UINT16(objptr + 18);
+			offset = (byte) READ_LE_UINT16(objptr + 18);
 
 		size = READ_LE_UINT16(objptr) - offset;
 		name = objptr + offset;

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- object.cpp	16 Jun 2003 14:45:23 -0000	1.123
+++ object.cpp	18 Jun 2003 22:35:03 -0000	1.124
@@ -518,9 +518,9 @@
 	if (_version == 8)
 		_numObjectsInRoom = (byte)READ_LE_UINT32(&(roomhdr->v8.numObjects));
 	else if (_version == 7)
-		_numObjectsInRoom = READ_LE_UINT16(&(roomhdr->v7.numObjects));
+		_numObjectsInRoom = (byte) READ_LE_UINT16(&(roomhdr->v7.numObjects));
 	else
-		_numObjectsInRoom = READ_LE_UINT16(&(roomhdr->old.numObjects));
+		_numObjectsInRoom = (byte) READ_LE_UINT16(&(roomhdr->old.numObjects));
 
 	if (_numObjectsInRoom == 0)
 		return;
@@ -645,7 +645,7 @@
 	room = getResourceAddress(rtRoom, _roomResource);
 	roomhdr = (const RoomHeader *)findResourceData(MKID('RMHD'), room);
 
-	_numObjectsInRoom = READ_LE_UINT16(&(roomhdr->old.numObjects));
+	_numObjectsInRoom = (byte) READ_LE_UINT16(&(roomhdr->old.numObjects));
 
 	if (_numObjectsInRoom == 0)
 		return;
@@ -773,7 +773,7 @@
 		od->y_pos = READ_LE_UINT16(&imhd->v7.y_pos);
 		od->width = READ_LE_UINT16(&imhd->v7.width);
 		od->height = READ_LE_UINT16(&imhd->v7.height);
-		od->actordir = READ_LE_UINT16(&imhd->v7.actordir);
+		od->actordir = (byte) READ_LE_UINT16(&imhd->v7.actordir);
 
 	} else if (_version == 6) {
 		od->obj_nr = READ_LE_UINT16(&(cdhd->v6.obj_id));
@@ -933,7 +933,7 @@
 		else if (_features & GF_OLD_BUNDLE)
 			offset = *(objptr + 16);
 		else
-			offset = READ_LE_UINT16(objptr + 18);
+			offset = (byte) READ_LE_UINT16(objptr + 18);
 
 		return (objptr + offset);
 	}