diff options
| author | James Brown | 2004-01-16 08:23:46 +0000 |
|---|---|---|
| committer | James Brown | 2004-01-16 08:23:46 +0000 |
| commit | d300c79c1a3aedff8f2acd814076c03470639c19 (patch) | |
| tree | edde011bd2b07140ea2242149c21504b92b646a0 /scumm | |
| parent | 673862dbfd8d17166000cdf5bd68dd9a90092034 (diff) | |
| download | scummvm-rg350-d300c79c1a3aedff8f2acd814076c03470639c19.tar.gz scummvm-rg350-d300c79c1a3aedff8f2acd814076c03470639c19.tar.bz2 scummvm-rg350-d300c79c1a3aedff8f2acd814076c03470639c19.zip | |
Revert Fix for bug #738352 (DIG: Cursor image appears in upper left corner) - Fingolfin's commit and revision 1.162. Causes regressions such as Sam and Max bug #877798 (Inventory display glitches).
Max - Sam and Max has the most complex usage of flObjects of most games, so if you want to test for regressions with these kind of changes it's your best bet :)
svn-id: r12425
Diffstat (limited to 'scumm')
| -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; |