[Scummvm-cvs-logs] CVS: scummvm/scumm boxes.cpp,1.16,1.17

Max Horn fingolfin at users.sourceforge.net
Sun Apr 27 15:22:10 CEST 2003


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

Modified Files:
	boxes.cpp 
Log Message:
clarified hack

Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/boxes.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- boxes.cpp	11 Apr 2003 12:57:41 -0000	1.16
+++ boxes.cpp	27 Apr 2003 22:21:22 -0000	1.17
@@ -207,9 +207,13 @@
 	byte *ptr = getResourceAddress(rtMatrix, 2);
 	if (!ptr)
 		return NULL;
-	// stops pass to adventure loom demo from working properly
+	// FIXME: In "pass to adventure", the loom demo, when bobbin enters
+	// the tent to the elders, box = 2, but ptr[0] = 2 -> errors out.
+	// Hence we disable the check for now. Maybe in PASS (and other old games)
+	// we shouldn't subtract 1 from ptr[0] when performing the check?
 	if (_gameId != GID_MONKEY_EGA)
 		checkRange(ptr[0] - 1, 0, box, "Illegal box %d");
+
 	if (_features & GF_SMALL_HEADER) {
 		if (_features & GF_AFTER_V3) // GF_OLD256 or GF_AFTER_V3 ?
 			return (Box *)(ptr + box * (SIZEOF_BOX - 2) + 1);





More information about the Scummvm-git-logs mailing list