[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.253.2.6,1.253.2.7

Max Horn fingolfin at users.sourceforge.net
Thu Jan 26 01:41:12 CET 2006


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

Modified Files:
      Tag: branch-0-8-0
	object.cpp 
Log Message:
Backporting two more SCUMM fixes

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.253.2.6
retrieving revision 1.253.2.7
diff -u -d -r1.253.2.6 -r1.253.2.7
--- object.cpp	26 Jan 2006 02:23:13 -0000	1.253.2.6
+++ object.cpp	26 Jan 2006 09:40:47 -0000	1.253.2.7
@@ -110,7 +110,7 @@
 	else
 		_classData[obj] &= ~(1 << (cls - 1));
 
-	if (1 <= obj && obj < _numActors) {
+	if (_version <= 4 && obj >= 1 && obj < _numActors) {
 		_actors[obj].classChanged(cls, set);
 	}
 }
@@ -494,7 +494,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