[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.15,1.16

James Brown ender at users.sourceforge.net
Sun Nov 10 10:12:02 CET 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv19127/scumm

Modified Files:
	object.cpp 
Log Message:
Game-specific a likely incorrect fix for Indy3 (Class 22 is the "Don't mask" flag, so why translate it to something else?)

*hurts khalek badly and mumbles about regression testing during a CVS freeze..*


Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- object.cpp	10 Nov 2002 09:14:20 -0000	1.15
+++ object.cpp	10 Nov 2002 18:11:39 -0000	1.16
@@ -38,7 +38,8 @@
 
 		if (cls == 32)							// CLASS_TOUCHABLE
 			cls = 24;
-		if (cls == 22)
+
+		if (_gameId == GID_INDY3_256 && cls == 22)			// Masking fix for Indy3
 			cls = 21;
 	}
 	return (_classData[obj] & (1 << (cls - 1))) != 0;
@@ -57,7 +58,8 @@
 
 		if (cls == 32)							// CLASS_TOUCHABLE
 			cls = 24;
-		if (cls == 22)
+
+		if (_gameId == GID_INDY3_256 && cls == 22)			// Masking fix for Indy3
 			cls = 21;
 	}
 





More information about the Scummvm-git-logs mailing list