From ffadd452a91a379c4fc64b2516f20088c056893a Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 20 May 2003 19:35:40 +0000
Subject: 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
---
 scumm/object.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scumm/object.cpp')

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;
 	}
-- 
cgit v1.2.3