diff options
| author | Max Horn | 2003-05-20 19:35:40 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-20 19:35:40 +0000 |
| commit | ffadd452a91a379c4fc64b2516f20088c056893a (patch) | |
| tree | 6be6d6d8d7e267cb5573944e96a8ab90e0e4779f /scumm/object.cpp | |
| parent | 1f859e592f278f3fd4746ce4b65b5a12ea0453d5 (diff) | |
| download | scummvm-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/object.cpp')
| -rw-r--r-- | scumm/object.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index bbaa764cb2..ab1a952504 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -237,7 +237,7 @@ int Scumm::getObjActToObjActDist(int a, int b) { return 0xFF; if (acta) { - AdjustBoxResult r = acta->adjustXYToBeInBox(x2, y2, -1); + AdjustBoxResult r = acta->adjustXYToBeInBox(x2, y2); x2 = r.x; y2 = r.y; } |