[Scummvm-cvs-logs] CVS: scummvm/scumm boxes.cpp,1.28,1.29 script_v2.cpp,2.82,2.83

[Max Horn]

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

Modified Files:
	boxes.cpp script_v2.cpp 
Log Message:
enable box'ed walking in V2 games

Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/boxes.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- boxes.cpp	19 May 2003 00:17:34 -0000	1.28
+++ boxes.cpp	19 May 2003 00:25:26 -0000	1.29
@@ -577,8 +577,7 @@
 	boxm = getBoxMatrixBaseAddr();
 
 	if (_features & GF_AFTER_V2) {
-		i = boxm[from];
-		boxm += numOfBoxes;
+		boxm += numOfBoxes + boxm[from];
 		return boxm[to];
 	}
 

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.82
retrieving revision 2.83
diff -u -d -r2.82 -r2.83
--- script_v2.cpp	18 May 2003 23:46:30 -0000	2.82
+++ script_v2.cpp	19 May 2003 00:25:26 -0000	2.83
@@ -920,7 +920,6 @@
 	y = getVarOrDirectByte(0x20) * 2;
 
 	assert(a);
-	a->ignoreBoxes = true;	// FIXME: Disabling walkboxes for now, just to debug the intro
 	a->startWalkActor(x, y, -1);
 }