diff options
| author | Max Horn | 2004-01-11 21:52:24 +0000 |
|---|---|---|
| committer | Max Horn | 2004-01-11 21:52:24 +0000 |
| commit | c67d25cfb9c861ae7c11b06c844a8c16419aa236 (patch) | |
| tree | 795ca2759c91bccf3cb0b5f79befccb688f6a10d /scumm/object.cpp | |
| parent | c1f34030f9a0ded0ad4a7848121a73f82a69f333 (diff) | |
| download | scummvm-rg350-c67d25cfb9c861ae7c11b06c844a8c16419aa236.tar.gz scummvm-rg350-c67d25cfb9c861ae7c11b06c844a8c16419aa236.tar.bz2 scummvm-rg350-c67d25cfb9c861ae7c11b06c844a8c16419aa236.zip | |
Fix for bug #738352 (DIG: Cursor image appears in upper left corner): don't draw flObjects in drawRoomObject(); this may cause regressions (I think it would be helpful to compile a list of some/many/all flObjects in all games, that would really help with debugging them :-)
svn-id: r12328
Diffstat (limited to 'scumm/object.cpp')
| -rw-r--r-- | scumm/object.cpp | 7 |
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; |