[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.18,1.19

Max Horn fingolfin at users.sourceforge.net
Thu Dec 12 17:34:02 CET 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv31963/scumm

Modified Files:
	object.cpp 
Log Message:
Patch #649356, INDY3: Possible intro fix

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- object.cpp	4 Dec 2002 21:45:50 -0000	1.18
+++ object.cpp	13 Dec 2002 01:33:23 -0000	1.19
@@ -38,9 +38,6 @@
 
 		if (cls == 32)							// CLASS_TOUCHABLE
 			cls = 24;
-
-		if (_gameId == GID_INDY3_256 && cls == 22 && _currentRoom == 76)			// Masking fix for Indy3
-			cls = 21;
 	}
 	return (_classData[obj] & (1 << (cls - 1))) != 0;
 }
@@ -59,8 +56,12 @@
 		if (cls == 32)							// CLASS_TOUCHABLE
 			cls = 24;
 
-		if (_gameId == GID_INDY3_256 && cls == 22 && _currentRoom == 76)			// Masking fix for Indy3
-			cls = 21;
+		// FIXME: It isn't enough for the Indy3 intro to make the
+		// little trains ignore boxes (class 22), they have to always
+		// clip (class 21) as well. Is this yet another walkbox 0
+		// error?
+		if (_gameId == GID_INDY3_256 && cls == 22 && _currentRoom == 76)
+			putClass(obj, 21, set);
 	}
 
 	if (set)





More information about the Scummvm-git-logs mailing list