diff options
| -rw-r--r-- | scumm/object.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index 08a658f1c6..56e4b49eaf 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -350,9 +350,7 @@ void ScummEngine::drawRoomObject(int i, int arg) { do { a = od->parentstate; if (!od->parent) { - // Ignore FlObjects (they are drawn some other place) - if (od->fl_object_index == 0) - drawObject(i, arg); + drawObject(i, arg); break; } od = &_objs[od->parent]; @@ -404,6 +402,9 @@ void ScummEngine::drawObject(int obj, int arg) { if (_BgNeedsRedraw) arg = 0; + if (od.obj_nr == 0) + return; + checkRange(_numGlobalObjects - 1, 0, od.obj_nr, "Object %d out of range in drawObject"); xpos = od.x_pos / 8; |