[Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.88,1.89

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv10553

Modified Files:
	actor.cpp 
Log Message:
tiny fix to account for the fact that GF_SMALL_HEADER games have walk box 0

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- actor.cpp	15 Jul 2002 15:29:47 -0000	1.88
+++ actor.cpp	15 Jul 2002 18:11:30 -0000	1.89
@@ -601,7 +601,7 @@
 					if (flags & 0x80 && (!(flags & 0x20) || _vm->getClass(number, 0x1F)))
 						continue;
 
-					if (pathfrom && (_vm->getPathToDestBox(pathfrom, j) == -1))
+					if (pathfrom >= firstValidBox && (_vm->getPathToDestBox(pathfrom, j) == -1))
 						continue;
 
 					if (!_vm->inBoxQuickReject(j, dstX, dstY, threshold))
@@ -637,6 +637,7 @@
 			threshold = (threshold == 30) ? 80 : 0;
 		}
 	}
+
 	return abr;
 }
 
@@ -645,7 +646,7 @@
 	AdjustBoxResult abr;
 	byte flags;
 
-	abr = adjustXYToBeInBox(x, y, 0);
+	abr = adjustXYToBeInBox(x, y, -1);
 
 	x = abr.x;
 	y = abr.y;