[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.256,1.257

Gregory Montoir cyx at users.sourceforge.net
Sat Oct 22 01:20:33 CEST 2005


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

Modified Files:
	object.cpp 
Log Message:
Gdi::dbDrawMaskOnAll doesn't need to be set in TheDig and FT sets it when object has class 31.

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -d -r1.256 -r1.257
--- object.cpp	21 Oct 2005 17:43:30 -0000	1.256
+++ object.cpp	22 Oct 2005 08:19:28 -0000	1.257
@@ -489,7 +489,8 @@
 
 		// 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 ((_gameId == GID_SAMNMAX && getClass(od.obj_nr, kObjectClassIgnoreBoxes)) ||
+		    (_gameId == GID_FT && getClass(od.obj_nr, kObjectClassPlayer)))
 			flags |= Gdi::dbDrawMaskOnAll;
 
 		if (_heversion >= 70 && findResource(MKID('SMAP'), ptr) == NULL)





More information about the Scummvm-git-logs mailing list