[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.176,1.177

[Max Horn]

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

Modified Files:
	actor.cpp 
Log Message:
reverse my fix for the sarcophagus problem (I reopened that bug report, as this broke lots of other locked boxees. Now that I have dosbox to compared with the original Zak, I see that we are doing something wrong, and have a notion of what that might be; still need to figure out a way how to fix it

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -d -r1.176 -r1.177
--- actor.cpp	13 Sep 2003 23:50:29 -0000	1.176
+++ actor.cpp	14 Sep 2003 13:36:49 -0000	1.177
@@ -1473,13 +1473,12 @@
 		// Can't walk through locked boxes
 		int flags = _vm->getBoxFlags(next_box);
 		if (flags & kBoxLocked && !(flags & kBoxPlayerOnly && !isPlayer())) {
-//			moving |= MF_LAST_LEG;
-//			return;
-			break;
+			moving |= MF_LAST_LEG;
+			return;
 		}
 
 		walkdata.curbox = next_box;
-		
+
 		if (_vm->_version <= 2) {
 			_vm->getClosestPtOnBox(walkdata.curbox, x, y, p2.x, p2.y);
 			_vm->getClosestPtOnBox(walkbox, p2.x, p2.y, p3.x, p3.y);
@@ -1488,7 +1487,7 @@
 			if (p2.x == 32000 && p3.x == 32000) {
 				break;
 			}
-	
+
 			if (p2.x != 32000) {
 				if (calcMovementFactor(p2)) {
 					walkdata.point3 = p3;