fix for #591678. This may very well break other things, so if you experience weird problems with actor placement, or are suddenly not able to operate certain items, you know whom to blame

svn-id: r4730

1 files changed, 6 insertions, 6 deletions

diff --git a/actor.cpp b/actor.cpp
index 4044760472..95e2fe3bfe 100644
--- a/actor.cpp
+++ b/actor.cpp
@@ -559,7 +559,7 @@ AdjustBoxResult Actor::adjustXYToBeInBox(int dstX, int dstY, int pathfrom)
 	uint threshold;
 	uint best;
 	int box, iterations = 0;			/* Use iterations for those odd times we get stuck in the loop */
-	int firstValidBox, j;
+	int firstValidBox, i, j;
 	byte flags, b;
 
 	if (_vm->_features & GF_SMALL_HEADER)
@@ -587,12 +587,12 @@ AdjustBoxResult Actor::adjustXYToBeInBox(int dstX, int dstY, int pathfrom)
 
 			if (!(_vm->_features & GF_OLD256) || box)
 			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);
+					flags = _vm->getBoxFlags(j);
+					if (flags & 0x80 && (!(flags & 0x20) || isInClass(31)))
+						continue;
+	
+					i = _vm->getPathToDestBox(pathfrom, j);
 					if (i == -1)
 						continue;