From 24533e6e2d0777082e93d5643932820691fd987f Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sat, 21 Sep 2002 00:23:45 +0000
Subject: partial fix for bug #605970

svn-id: r4984
---
 scumm/actor.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'scumm/actor.cpp')

diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index 6f45edf088..d62d20f7d7 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -1099,6 +1099,11 @@ void Actor::startWalkActor(int destX, int destY, int dir)
 		abr.dist = 0;
 		walkbox = 0;
 	} else {
+		// FIXME: this prevents part of bug #605970 (Loom) from occuring. Not sure
+		// if there is a better way to achieve this.
+		if (walkbox == 0)
+			adjustActorPos();
+
 		if (_vm->checkXYInBoxBounds(walkdata.destbox, abr.x, abr.y)) {
 			abr.dist = walkdata.destbox;
 		} else {
-- 
cgit v1.2.3