diff options
| author | James Brown | 2002-12-24 12:09:11 +0000 |
|---|---|---|
| committer | James Brown | 2002-12-24 12:09:11 +0000 |
| commit | 600e516ef2f14d2a9d694d36b2b397d6877d734b (patch) | |
| tree | b8d8d34ed76de921bb2f72e8238cc4bb0a5c0733 /scumm/object.cpp | |
| parent | 774761c06677972e04486a6db31aaf63acb89707 (diff) | |
| download | scummvm-rg350-600e516ef2f14d2a9d694d36b2b397d6877d734b.tar.gz scummvm-rg350-600e516ef2f14d2a9d694d36b2b397d6877d734b.tar.bz2 scummvm-rg350-600e516ef2f14d2a9d694d36b2b397d6877d734b.zip | |
Cope with relocation of room scripts into a subbranch of LFLF, not ROOM
svn-id: r6097
Diffstat (limited to 'scumm/object.cpp')
| -rw-r--r-- | scumm/object.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index 50f940c3ac..8d77358761 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) |