[Scummvm-cvs-logs] CVS: scummvm/scumm object.cpp,1.132,1.133 boxes.cpp,1.41,1.42

[Max Horn]

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

Modified Files:
	object.cpp boxes.cpp 
Log Message:
this FIXME is obsoleted by my recent fix for getMaskFromBox

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- object.cpp	27 Jun 2003 05:00:32 -0000	1.132
+++ object.cpp	30 Jun 2003 22:22:04 -0000	1.133
@@ -101,12 +101,6 @@
 		}
 	}
 
-	// FIXME: It isn't enough for the Indy3 intro to make the
-	// little trains ignore boxes, they have to always clip as
-	// well. Is this yet another walkbox 0 error?
-	if (_gameId == GID_INDY3_256 && cls == kObjectClassIgnoreBoxes && _currentRoom == 76)
-		putClass(obj, kObjectClassAlwaysClip, set);
-
 	if (set)
 		_classData[obj] |= (1 << (cls - 1));
 	else

Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/boxes.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- boxes.cpp	30 Jun 2003 20:12:34 -0000	1.41
+++ boxes.cpp	30 Jun 2003 22:22:04 -0000	1.42
@@ -82,7 +82,7 @@
 
 
 byte Scumm::getMaskFromBox(int box) {
-	// FIXME: see bug #740244 and #755863. This appears to have been a 
+	// Fix for bug #740244 and #755863. This appears to have been a 
 	// long standing bug in the original engine?
 	if (_version <= 3 && box == 255)
 		return 1;