[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.161,1.162
Max Horn
fingolfin at users.sourceforge.net
Sun Jan 11 13:53:01 CET 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv15481
Modified Files:
object.cpp
Log Message:
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 :-)
Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- object.cpp 11 Jan 2004 21:48:31 -0000 1.161
+++ object.cpp 11 Jan 2004 21:52:24 -0000 1.162
@@ -350,7 +350,9 @@
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];
@@ -401,9 +403,6 @@
if (_BgNeedsRedraw)
arg = 0;
-
- if (od.obj_nr == 0)
- return;
checkRange(_numGlobalObjects - 1, 0, od.obj_nr, "Object %d out of range in drawObject");
More information about the Scummvm-git-logs
mailing list