diff options
| author | James Brown | 2002-04-19 16:26:44 +0000 |
|---|---|---|
| committer | James Brown | 2002-04-19 16:26:44 +0000 |
| commit | 7f4f0fcb69736c1814fe423dca06ddafc829edad (patch) | |
| tree | af01aee33059c1424bf6490a0aaabf5324fa5dd3 /object.cpp | |
| parent | 780aecab878aaf96944bf8591dfd4da87b442a63 (diff) | |
| download | scummvm-rg350-7f4f0fcb69736c1814fe423dca06ddafc829edad.tar.gz scummvm-rg350-7f4f0fcb69736c1814fe423dca06ddafc829edad.tar.bz2 scummvm-rg350-7f4f0fcb69736c1814fe423dca06ddafc829edad.zip | |
Fix various Zak256 crashes. Ticket machine works, taking Blue Crystal crashes.
svn-id: r4013
Diffstat (limited to 'object.cpp')
| -rw-r--r-- | object.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/object.cpp b/object.cpp index 9339b74001..48a19c820b 100644 --- a/object.cpp +++ b/object.cpp @@ -822,10 +822,9 @@ void Scumm::findObjectInRoom(FindObjectInRoom * fo, byte findWhat, uint id, } fo->roomptr = roomptr = getResourceAddress(rtRoom, room); - if (!roomptr) { // FIXME: ZAK256 AIRPORT WORKAROUND (buying book from devotee) - warning("findObjectInRoom: failed getting roomptr to %d", room); - return; - } + if (!roomptr) + error("findObjectInRoom: failed getting roomptr to %d", room); + roomhdr = (RoomHeader *)findResourceData(MKID('RMHD'), roomptr); if (_features & GF_AFTER_V7) |