diff options
| author | James Brown | 2002-12-24 12:49:25 +0000 |
|---|---|---|
| committer | James Brown | 2002-12-24 12:49:25 +0000 |
| commit | 5d2d6e11b33013e40d6979b5ed1aa85ff96c3082 (patch) | |
| tree | 5c4797fdf9c3453cd0294641e0fd3d676696fdaf /scumm/object.cpp | |
| parent | 9df8cf4ebadc08bdac3d003644430b53c5251b96 (diff) | |
| download | scummvm-rg350-5d2d6e11b33013e40d6979b5ed1aa85ff96c3082.tar.gz scummvm-rg350-5d2d6e11b33013e40d6979b5ed1aa85ff96c3082.tar.bz2 scummvm-rg350-5d2d6e11b33013e40d6979b5ed1aa85ff96c3082.zip | |
Fix silly mistake
svn-id: r6099
Diffstat (limited to 'scumm/object.cpp')
| -rw-r--r-- | scumm/object.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index 3a7aadeb5d..a86c9e51b6 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -397,7 +397,7 @@ void Scumm::loadRoomObjects() ObjectData *od; byte *ptr; uint16 obim_id; - byte *room, *searchptr; + byte *room, *searchptr, *rootptr; ImageHeader *imhd; RoomHeader *roomhdr; CodeHeader *cdhd; @@ -421,16 +421,16 @@ void Scumm::loadRoomObjects() 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) |