diff options
| author | Max Horn | 2002-12-26 21:50:13 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-26 21:50:13 +0000 |
| commit | ad7fefd34eb81ab473293c4072432b36608d93aa (patch) | |
| tree | e510c3c891268394cf1659241bf8e079be017c98 /scumm/object.cpp | |
| parent | 966d435a19930ae357b333d731f6b70e91b5a351 (diff) | |
| download | scummvm-rg350-ad7fefd34eb81ab473293c4072432b36608d93aa.tar.gz scummvm-rg350-ad7fefd34eb81ab473293c4072432b36608d93aa.tar.bz2 scummvm-rg350-ad7fefd34eb81ab473293c4072432b36608d93aa.zip | |
map V8 talk opcodes to the right V6 opcodes; however, talking still locks up after the first sentence is uttered (looking into that now); various cleanup; added a guess at VAR_EGO (based on what cmidec says is the 'default_actor')
svn-id: r6176
Diffstat (limited to 'scumm/object.cpp')
| -rw-r--r-- | scumm/object.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index 8af39580f7..f784ccfe95 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -490,7 +490,8 @@ void Scumm::loadRoomObjectsSmall() byte *room, *searchptr; RoomHeader *roomhdr; - CHECK_HEAP room = getResourceAddress(rtRoom, _roomResource); + CHECK_HEAP + room = getResourceAddress(rtRoom, _roomResource); roomhdr = (RoomHeader *)findResourceData(MKID('RMHD'), room); _numObjectsInRoom = READ_LE_UINT16(&(roomhdr->old.numObjects)); @@ -825,7 +826,8 @@ void Scumm::addObjectToInventory(uint obj, uint room) debug(1, "Adding object %d from room %d into inventory", obj, room); - CHECK_HEAP if (whereIsObject(obj) == WIO_FLOBJECT) { + CHECK_HEAP + if (whereIsObject(obj) == WIO_FLOBJECT) { i = getObjectIndex(obj); ptr = getResourceAddress(rtFlObject, _objs[i].fl_object_index) + 8; size = READ_BE_UINT32_UNALIGNED(ptr + 4); |