[Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.109,1.110

Max Horn fingolfin at users.sourceforge.net
Thu Aug 15 15:09:04 CEST 2002


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

Modified Files:
	actor.cpp 
Log Message:
this seems to fix #591678 (again :-) while not causing problems for the counter or in the airplane

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- actor.cpp	15 Aug 2002 16:46:29 -0000	1.109
+++ actor.cpp	15 Aug 2002 22:08:29 -0000	1.110
@@ -589,13 +589,13 @@
 			for (j = box; j >= firstValidBox; j--) {
 				flags = _vm->getBoxFlags(j);
 
-				if (flags & kBoxLocked && (!(flags & kBoxPlayerOnly)))
-					continue;
-
 				if (flags & kBoxInvisible && (!(flags & kBoxPlayerOnly) || isInClass(31)))
 					continue;
 				
 				if (pathfrom >= firstValidBox) {
+
+					if (flags & kBoxLocked && (!(flags & kBoxPlayerOnly)))
+						continue;
 
 					i = _vm->getPathToDestBox(pathfrom, j);
 					if (i == -1)





More information about the Scummvm-git-logs mailing list