fixed buglet that allowed you to leave the crow nest in MonkeyVGA (on the SeaMonkey). Could break other stuff, but I see no way how. Since I am the one to blame for any box bugs currently anyway, I don't care for one more :-)

svn-id: r4659

1 files changed, 37 insertions, 39 deletions

diff --git a/actor.cpp b/actor.cpp
index eed6e0fd9c..e03af6b6d1 100644
--- a/actor.cpp
+++ b/actor.cpp
@@ -584,60 +584,58 @@ AdjustBoxResult Actor::adjustXYToBeInBox(int dstX, int dstY, int pathfrom)
 			if (iterations > 1000)
 				return abr;							/* Safety net */
 			box = _vm->getNumBoxes() - 1;
-			if (box == 0)
+			if (box < firstValidBox)
 				return abr;
 
 			best = (uint) 0xFFFF;
 			b = 0;
 
-			if (((_vm->_features & GF_SMALL_HEADER) && box)
-					|| !(_vm->_features & GF_SMALL_HEADER))
-				for (j = box; j >= firstValidBox; j--) {
-					flags = _vm->getBoxFlags(j);
-					if (flags & 0x80 && (!(flags & 0x20) || isInClass(31)))
-						continue;
+			for (j = box; j >= firstValidBox; j--) {
+				flags = _vm->getBoxFlags(j);
+				if (flags & 0x80 && (!(flags & 0x20) || isInClass(31)))
+					continue;
 
-					if (pathfrom >= firstValidBox) {
-						int i = _vm->getPathToDestBox(pathfrom, j);
-						if (i == -1)
+				if (pathfrom >= firstValidBox) {
+					int i = _vm->getPathToDestBox(pathfrom, j);
+					if (i == -1)
+						continue;
+					
+					if (_vm->_features & GF_OLD256) {
+						// FIXME - we check here if the box suggested by getPathToDestBox
+						// is locked or not. This prevents us from walking thru
+						// closed doors in some cases in Zak256. However a better fix
+						// would be to recompute the box matrix whenever flags change.
+						flags = _vm->getBoxFlags(i);
+						if (flags & 0x80 && (!(flags & 0x20) || isInClass(31)))
 							continue;
-						
-						if (_vm->_features & GF_OLD256) {
-							// FIXME - we check here if the box suggested by getPathToDestBox
-							// is locked or not. This prevents us from walking thru
-							// closed doors in some cases in Zak256. However a better fix
-							// would be to recompute the box matrix whenever flags change.
-							flags = _vm->getBoxFlags(i);
-							if (flags & 0x80 && (!(flags & 0x20) || isInClass(31)))
-								continue;
-						}
 					}
+				}
 
-					if (!_vm->inBoxQuickReject(j, dstX, dstY, threshold))
-						continue;
+				if (!_vm->inBoxQuickReject(j, dstX, dstY, threshold))
+					continue;
 
-					if (_vm->checkXYInBoxBounds(j, dstX, dstY)) {
-						abr.x = dstX;
-						abr.y = dstY;
-						abr.dist = j;
-						return abr;
-					}
+				if (_vm->checkXYInBoxBounds(j, dstX, dstY)) {
+					abr.x = dstX;
+					abr.y = dstY;
+					abr.dist = j;
+					return abr;
+				}
 
-					tmp = _vm->getClosestPtOnBox(j, dstX, dstY);
+				tmp = _vm->getClosestPtOnBox(j, dstX, dstY);
 
-					if (tmp.dist >= best)
-						continue;
+				if (tmp.dist >= best)
+					continue;
 
-					abr.x = tmp.x;
-					abr.y = tmp.y;
+				abr.x = tmp.x;
+				abr.y = tmp.y;
 
-					if (tmp.dist == 0) {
-						abr.dist = j;
-						return abr;
-					}
-					best = tmp.dist;
-					b = j;
+				if (tmp.dist == 0) {
+					abr.dist = j;
+					return abr;
 				}
+				best = tmp.dist;
+				b = j;
+			}
 
 			if (threshold == 0 || threshold * threshold >= best) {
 				abr.dist = b;