[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.21,1.22

[James Brown]

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

Modified Files:
	object.cpp 
Log Message:
Cope with relocation of room scripts into a subbranch of LFLF, not ROOM


Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- object.cpp	24 Dec 2002 04:02:21 -0000	1.21
+++ object.cpp	24 Dec 2002 12:09:11 -0000	1.22
@@ -419,7 +419,12 @@
 		error("More than %d objects in room %d", _numLocalObjects, _roomResource);
 
 	od = &_objs[1];
-	searchptr = room;
+
+	if (_features & GF_AFTER_V7)
+		searchptr = getResourceAddress(rtRoomScripts, _roomResource);
+	else
+		searchptr = room;
+
 	for (i = 0; i < _numObjectsInRoom; i++, od++) {
 		ptr = findResource(MKID('OBCD'), searchptr);
 		if (ptr == NULL)