From 600e516ef2f14d2a9d694d36b2b397d6877d734b Mon Sep 17 00:00:00 2001
From: James Brown <ender@users.sourceforge.net>
Date: Tue, 24 Dec 2002 12:09:11 +0000
Subject: [PATCH] Cope with relocation of room scripts into a subbranch of
 LFLF, not ROOM

svn-id: r6097
---
 scumm/object.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scumm/object.cpp b/scumm/object.cpp
index 50f940c3ac1..8d773587617 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -419,7 +419,12 @@ void Scumm::loadRoomObjects()
 		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)