[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.73,1.74 script.cpp,1.52,1.53 script_v5.cpp,1.29,1.30

[Pawel Kolodziejski]

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

Modified Files:
	object.cpp script.cpp script_v5.cpp 
Log Message:
handle old_bundle offsets getVerbEntrypoint(), o5_setObjectName(), getObjOrActorName() funcs

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- object.cpp	13 Apr 2003 16:21:41 -0000	1.73
+++ object.cpp	13 Apr 2003 16:42:33 -0000	1.74
@@ -831,7 +831,10 @@
 
 		objptr = getOBCDFromObject(obj);
 		if (objptr)
-			offset = READ_LE_UINT16(objptr + 18);
+			if (_features & GF_OLD_BUNDLE)
+				offset = READ_LE_UINT16(objptr + 20);
+			else
+				offset = READ_LE_UINT16(objptr + 18);
 		return (objptr + offset);
 	}
 

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- script.cpp	10 Apr 2003 06:18:23 -0000	1.52
+++ script.cpp	13 Apr 2003 16:42:33 -0000	1.53
@@ -874,7 +874,9 @@
 	objptr = getOBCDFromObject(obj);
 	assert(objptr);
 
-	if (_features & GF_SMALL_HEADER)
+	if (_features & GF_OLD_BUNDLE)
+		verbptr = objptr + 21;
+	else if (_features & GF_SMALL_HEADER)
 		verbptr = objptr + 19;
 	else
 		verbptr = findResource(MKID('VERB'), objptr);

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- script_v5.cpp	13 Apr 2003 16:03:48 -0000	1.29
+++ script_v5.cpp	13 Apr 2003 16:42:33 -0000	1.30
@@ -1899,7 +1899,10 @@
 		byte offset = 0;
 
 		objptr = getOBCDFromObject(obj);
-		offset = READ_LE_UINT16(objptr + 18);
+		if (_features & GF_OLD_BUNDLE)
+			offset = READ_LE_UINT16(objptr + 20);
+		else
+			offset = READ_LE_UINT16(objptr + 18);
 		size = READ_LE_UINT16(objptr) - offset;
 	} else {
 		size = getResourceDataSize(name);