[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.253.2.2,1.253.2.3

[kirben]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22006/scumm

Modified Files:
      Tag: branch-0-8-0
	object.cpp 
Log Message:

Add work around for fbear regressions.


Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.253.2.2
retrieving revision 1.253.2.3
diff -u -d -r1.253.2.2 -r1.253.2.3
--- object.cpp	21 Oct 2005 18:33:20 -0000	1.253.2.2
+++ object.cpp	25 Oct 2005 02:50:16 -0000	1.253.2.3
@@ -394,9 +394,13 @@
 			if (_objs[i].obj_nr > 0 && (_objs[i].state & mask) && _objs[i].fl_object_index == 0)
 				drawRoomObject(i, arg);
 		}
-		for (i = (_numLocalObjects-1); i > 0; i--) {
-			if (_objs[i].obj_nr > 0 && (_objs[i].state & mask) && _objs[i].fl_object_index != 0)
-				drawRoomObject(i, arg);
+		// FIXME: Work around for fbear regressions, causes parts of verb area to appear in upper left corner
+		// when changing rooms sometimes.
+		if (_heversion >= 71) {
+			for (i = (_numLocalObjects-1); i > 0; i--) {
+				if (_objs[i].obj_nr > 0 && (_objs[i].state & mask) && _objs[i].fl_object_index != 0)
+					drawRoomObject(i, arg);
+			}
 		}
 	} else if (_gameId == GID_SAMNMAX) {
 		// In Sam & Max, objects are drawn in reverse order.