aboutsummaryrefslogtreecommitdiff
path: root/scumm/actor.h
diff options
context:
space:
mode:
authorMax Horn2003-05-20 19:35:40 +0000
committerMax Horn2003-05-20 19:35:40 +0000
commitffadd452a91a379c4fc64b2516f20088c056893a (patch)
tree6be6d6d8d7e267cb5573944e96a8ab90e0e4779f /scumm/actor.h
parent1f859e592f278f3fd4746ce4b65b5a12ea0453d5 (diff)
downloadscummvm-rg350-ffadd452a91a379c4fc64b2516f20088c056893a.tar.gz
scummvm-rg350-ffadd452a91a379c4fc64b2516f20088c056893a.tar.bz2
scummvm-rg350-ffadd452a91a379c4fc64b2516f20088c056893a.zip
got rid of the evil locked-box hack in adjustXYToBeInBox; instead check for locked boxes in walkActorOld, which seems to work just as well (and hopefully better)
svn-id: r7750
Diffstat (limited to 'scumm/actor.h')
-rw-r--r--scumm/actor.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/actor.h b/scumm/actor.h
index c397799732..eac1557d7e 100644
--- a/scumm/actor.h
+++ b/scumm/actor.h
@@ -151,7 +151,7 @@ protected:
public:
void adjustActorPos();
- AdjustBoxResult adjustXYToBeInBox(int dstX, int dstY, int pathfrom);
+ AdjustBoxResult adjustXYToBeInBox(int dstX, int dstY);
void setDirection(int direction);
void faceToObject(int obj);