[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.95,1.96

[Max Horn]

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

Modified Files:
	actor.cpp 
Log Message:
fix for various regressions (not quite sure if the check for V2/v3 is right, but seems to work so far)

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- actor.cpp	18 May 2003 19:44:22 -0000	1.95
+++ actor.cpp	18 May 2003 23:14:21 -0000	1.96
@@ -1196,8 +1196,12 @@
 void Actor::startWalkActor(int destX, int destY, int dir) {
 	AdjustBoxResult abr;
 
-	abr.x = destX;
-	abr.y = destY;
+	if (_vm->_features & GF_AFTER_V2 || _vm->_features & GF_AFTER_V3) {
+		abr.x = destX;
+		abr.y = destY;
+	} else {
+		abr = adjustXYToBeInBox(destX, destY, walkbox);
+	}
 
 	if (!isInCurrentRoom()) {
 		x = abr.x;