aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scumm/object.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp
index 56e4b49eaf..8237e8a8d1 100644
--- a/scumm/object.cpp
+++ b/scumm/object.cpp
@@ -350,7 +350,9 @@ void ScummEngine::drawRoomObject(int i, int arg) {
do {
a = od->parentstate;
if (!od->parent) {
- drawObject(i, arg);
+ // Ignore FlObjects (they are drawn some other place)
+ if (od.od.fl_object_index == 0)
+ drawObject(i, arg);
break;
}
od = &_objs[od->parent];
@@ -402,9 +404,6 @@ 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;