[Scummvm-cvs-logs] CVS: scummvm/scumm boxes.cpp,1.75,1.76

Travis Howell kirben at users.sourceforge.net
Thu Sep 2 17:23:10 CEST 2004


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

Modified Files:
	boxes.cpp 
Log Message:

Add fingolfin's suggested solution for bug #881132


Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/boxes.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- boxes.cpp	14 Jul 2004 10:48:33 -0000	1.75
+++ boxes.cpp	3 Sep 2004 00:22:31 -0000	1.76
@@ -374,12 +374,10 @@
 	// checking at all. All the problems so far have been cases where
 	// the value was exactly one more than what we consider the maximum.
 	// So it's very well possible that all of these are script errors.
-	if ((_gameId == GID_PASS) || ((_features & GF_OLD_BUNDLE)
-	    && (_gameId == GID_INDY3 || _gameId == GID_ZAK))) {
-		checkRange(ptr[0], 0, box, "Illegal box %d");
-	} else
-		checkRange(ptr[0] - 1, 0, box, "Illegal box %d");
+	if (_version <= 4 && ptr[0] == box)
+	    box--;
 
+	checkRange(ptr[0] - 1, 0, box, "Illegal box %d");
 	if (_version <= 2)
 		return (Box *)(ptr + box * SIZEOF_BOX_V2 + 1);
 	else if (_version == 3)





More information about the Scummvm-git-logs mailing list