[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.72,1.73

Pawel Kolodziejski aquadran at users.sourceforge.net
Sun Apr 13 09:22:06 CEST 2003


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

Modified Files:
	object.cpp 
Log Message:
handle old_bundle size at addObjectToInventory() func

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- object.cpp	12 Apr 2003 18:43:23 -0000	1.72
+++ object.cpp	13 Apr 2003 16:21:41 -0000	1.73
@@ -905,7 +905,9 @@
 		size = READ_BE_UINT32_UNALIGNED(ptr + 4);
 	} else {
 		findObjectInRoom(&foir, foCodeHeader, obj, room);
-		if (_features & GF_SMALL_HEADER)
+		if (_features & GF_OLD_BUNDLE)
+			size = READ_LE_UINT16(foir.obcd);
+		else if (_features & GF_SMALL_HEADER)
 			size = READ_LE_UINT32(foir.obcd);
 		else
 			size = READ_BE_UINT32_UNALIGNED(foir.obcd + 4);





More information about the Scummvm-git-logs mailing list