[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.80,1.81 script_v2.cpp,2.21,2.22

[Pawel Kolodziejski]

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

Modified Files:
	object.cpp script_v2.cpp 
Log Message:
fixed offsets for object names for scumm v2

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- object.cpp	26 Apr 2003 16:45:23 -0000	1.80
+++ object.cpp	26 Apr 2003 16:56:59 -0000	1.81
@@ -836,7 +836,9 @@
 
 		objptr = getOBCDFromObject(obj);
 		if (objptr) {
-			if (_features & GF_OLD_BUNDLE)
+			if (_features & GF_AFTER_V2)
+				offset = *(objptr + 14);
+			else if (_features & GF_OLD_BUNDLE)
 				offset = *(objptr + 16);
 			else
 				offset = READ_LE_UINT16(objptr + 18);

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.21
retrieving revision 2.22
diff -u -d -r2.21 -r2.22
--- script_v2.cpp	26 Apr 2003 16:43:18 -0000	2.21
+++ script_v2.cpp	26 Apr 2003 16:56:59 -0000	2.22
@@ -1312,7 +1312,7 @@
 	byte offset = 0;
 
 	objptr = getOBCDFromObject(obj);
-	offset = *(objptr + 18);
+	offset = *(objptr + 14);
 	size = READ_LE_UINT16(objptr) - offset;
 
 	if (i >= size) {