[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.82,1.83 scummvm.cpp,2.109,2.110

[Pawel Kolodziejski]

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

Modified Files:
	object.cpp scummvm.cpp 
Log Message:
fixed two offsets for V2 and two warnings

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- object.cpp	28 Apr 2003 12:38:24 -0000	1.82
+++ object.cpp	28 Apr 2003 18:19:44 -0000	1.83
@@ -538,7 +538,11 @@
 	if (_numObjectsInRoom > _numLocalObjects)
 		error("More than %d objects in room %d", _numLocalObjects, _roomResource);
 
-	ptr = room + 29;
+	if (_features & GF_AFTER_V2)
+		ptr = room + 28;
+	else
+		ptr = room + 29;
+
 	for (i = 0; i < _numObjectsInRoom; i++) {
 		od = &_objs[findLocalObjectSlot()];
 
@@ -980,7 +984,11 @@
 		error("findObjectInRoom: More (%d) than %d objects in room %d", numobj, _numLocalObjects, room);
 
 	if (_features & GF_OLD_BUNDLE) {
-		searchptr = roomptr + 29;
+		if (_features & GF_AFTER_V2)
+			searchptr = roomptr + 28;
+		else
+			searchptr = roomptr + 29;
+
 		for (i = 0; i < numobj; i++) {
 			obimptr = roomptr + READ_LE_UINT16(searchptr);
 			obcdptr = roomptr + READ_LE_UINT16(searchptr + 2 * _numObjectsInRoom);

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.109
retrieving revision 2.110
diff -u -d -r2.109 -r2.110
--- scummvm.cpp	28 Apr 2003 16:57:53 -0000	2.109
+++ scummvm.cpp	28 Apr 2003 18:19:45 -0000	2.110
@@ -1096,7 +1096,7 @@
 					// HACK: to determine the sizes of the local scripts, we assume that
 					// a) their order in the data file is the same as in the index
 					// b) the last script at the same time is the last item in the room "header"
-					int len = - _localScriptList[id - _numGlobalScripts] + _resourceHeaderSize;
+					int len = - (int)_localScriptList[id - _numGlobalScripts] + _resourceHeaderSize;
 					if (*ptr)
 						len += READ_LE_UINT16(ptr + 1);
 					else