[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.163,1.164

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv5407/scumm

Modified Files:
	object.cpp 
Log Message:
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 :)



Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -d -r1.163 -r1.164
--- object.cpp	11 Jan 2004 21:55:26 -0000	1.163
+++ object.cpp	16 Jan 2004 08:23:46 -0000	1.164
@@ -350,9 +350,7 @@
 	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 @@
 	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;