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

[Gregory Montoir]

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

Modified Files:
      Tag: branch-0-8-0
	object.cpp 
Log Message:
backported fix for bug #1329220

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.253.2.1
retrieving revision 1.253.2.2
diff -u -d -r1.253.2.1 -r1.253.2.2
--- object.cpp	18 Oct 2005 02:11:21 -0000	1.253.2.1
+++ object.cpp	21 Oct 2005 18:33:20 -0000	1.253.2.2
@@ -489,7 +489,7 @@
 
 		// Sam & Max needs this to fix object-layering problems with
 		// the inventory and conversation icons.
-		if ((_version >= 7 || _gameId == GID_SAMNMAX) && getClass(od.obj_nr, kObjectClassIgnoreBoxes))
+		if ((_version == 7 || _gameId == GID_SAMNMAX) && getClass(od.obj_nr, kObjectClassIgnoreBoxes))
 			flags |= Gdi::dbDrawMaskOnAll;
 
 		if (_heversion >= 70 && findResource(MKID('SMAP'), ptr) == NULL)