[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.23,1.24

[James Brown]

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

Modified Files:
	object.cpp 
Log Message:
Fix silly mistake


Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- object.cpp	24 Dec 2002 12:27:35 -0000	1.23
+++ object.cpp	24 Dec 2002 12:49:25 -0000	1.24
@@ -397,7 +397,7 @@
 	ObjectData *od;
 	byte *ptr;
 	uint16 obim_id;
-	byte *room, *searchptr;
+	byte *room, *searchptr, *rootptr;
 	ImageHeader *imhd;
 	RoomHeader *roomhdr;
 	CodeHeader *cdhd;
@@ -421,16 +421,16 @@
 	od = &_objs[1];
 
 	if (_features & GF_AFTER_V8)
-		searchptr = getResourceAddress(rtRoomScripts, _roomResource);
+		searchptr = rootptr = getResourceAddress(rtRoomScripts, _roomResource);
 	else
-		searchptr = room;
+		searchptr = rootptr = room;
 
 	for (i = 0; i < _numObjectsInRoom; i++, od++) {
 		ptr = findResource(MKID('OBCD'), searchptr);
 		if (ptr == NULL)
 			error("Room %d missing object code block(s)", _roomResource);
 
-		od->offs_obcd_to_room = ptr - searchptr;
+		od->offs_obcd_to_room = ptr - rootptr;
 		cdhd = (CodeHeader *)findResourceData(MKID('CDHD'), ptr);
 
 		if (_features & GF_AFTER_V7)