thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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).

Browse source 
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
This commit is contained in:
James Brown 2004-01-16 08:23:46 +00:00
parent 673862dbfd
commit d300c79c1a
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
scumm/object.cpp
View file

@ -350,9 +350,7 @@ void ScummEngine::drawRoomObject(int i, int arg) {
do { do {
a = od->parentstate; a = od->parentstate;
if (!od->parent) { if (!od->parent) {
// Ignore FlObjects (they are drawn some other place) drawObject(i, arg);
if (od->fl_object_index == 0)
drawObject(i, arg);
break; break;
} }
od = &_objs[od->parent]; od = &_objs[od->parent];
@ -404,6 +402,9 @@ void ScummEngine::drawObject(int obj, int arg) {
if (_BgNeedsRedraw) if (_BgNeedsRedraw)
arg = 0; arg = 0;
if (od.obj_nr == 0)
return;
checkRange(_numGlobalObjects - 1, 0, od.obj_nr, "Object %d out of range in drawObject"); checkRange(_numGlobalObjects - 1, 0, od.obj_nr, "Object %d out of range in drawObject");
xpos = od.x_pos / 8; xpos = od.x_pos / 8;