[Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.106,1.107

[Max Horn]

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

Modified Files:
	actor.cpp 
Log Message:
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

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- actor.cpp	12 Aug 2002 16:05:14 -0000	1.106
+++ actor.cpp	12 Aug 2002 17:01:02 -0000	1.107
@@ -559,7 +559,7 @@
 	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 @@
 
 			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;