diff options
author | Max Horn | 2002-08-15 22:08:29 +0000 |
---|---|---|
committer | Max Horn | 2002-08-15 22:08:29 +0000 |
commit | dca89e3d88d4d3596929a7857153edfb03bc3002 (patch) | |
tree | 7cfc312959acf082a5c9994693aeff06253eeebb | |
parent | 064b547191b29dd4e8ec4ae6040574582813f867 (diff) | |
download | scummvm-rg350-dca89e3d88d4d3596929a7857153edfb03bc3002.tar.gz scummvm-rg350-dca89e3d88d4d3596929a7857153edfb03bc3002.tar.bz2 scummvm-rg350-dca89e3d88d4d3596929a7857153edfb03bc3002.zip |
this seems to fix #591678 (again :-) while not causing problems for the counter or in the airplane
svn-id: r4751
-rw-r--r-- | actor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -589,14 +589,14 @@ AdjustBoxResult Actor::adjustXYToBeInBox(int dstX, int dstY, int pathfrom) 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) continue; |