[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.70,1.71

[Max Horn]

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

Modified Files:
	actor.cpp 
Log Message:
fix actor gliding caused by my walk_script hack

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- actor.cpp	8 Mar 2003 13:29:41 -0000	1.70
+++ actor.cpp	8 Mar 2003 14:12:58 -0000	1.71
@@ -1307,7 +1307,7 @@
 	int new_dir, box;
 	int16 foundPathX, foundPathY;
 
-	if (_vm->_features & GF_AFTER_V7 && !(_vm->_features & GF_AFTER_V8)) {
+	if (_vm->_features & GF_AFTER_V7) {
 		// FIXME - this is kind of a hack right now but it fixes the
 		// walk scripts in The Dig.
 		if (moving & MF_FROZEN) {
@@ -1316,13 +1316,14 @@
 				if (facing != new_dir)
 					setDirection(new_dir);
 				else
-					moving = 0;
+					moving &= ~MF_TURN;
 			}
 			return;
 		}
-	} else if (moving == 0) {
-		return;
 	}
+
+	if (moving == 0)
+		return;
 
 	if (!(moving & MF_NEW_LEG)) {
 		if (moving & MF_IN_LEG && actorWalkStep())