mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-15 06:08:35 +00:00
Cope with relocation of room scripts into a subbranch of LFLF, not ROOM
svn-id: r6097
This commit is contained in:
parent
774761c066
commit
600e516ef2
@ -419,7 +419,12 @@ void Scumm::loadRoomObjects()
|
|||||||
error("More than %d objects in room %d", _numLocalObjects, _roomResource);
|
error("More than %d objects in room %d", _numLocalObjects, _roomResource);
|
||||||
|
|
||||||
od = &_objs[1];
|
od = &_objs[1];
|
||||||
searchptr = room;
|
|
||||||
|
if (_features & GF_AFTER_V7)
|
||||||
|
searchptr = getResourceAddress(rtRoomScripts, _roomResource);
|
||||||
|
else
|
||||||
|
searchptr = room;
|
||||||
|
|
||||||
for (i = 0; i < _numObjectsInRoom; i++, od++) {
|
for (i = 0; i < _numObjectsInRoom; i++, od++) {
|
||||||
ptr = findResource(MKID('OBCD'), searchptr);
|
ptr = findResource(MKID('OBCD'), searchptr);
|
||||||
if (ptr == NULL)
|
if (ptr == NULL)
|
||||||
|
Loading…
Reference in New Issue
Block a user