From 1da715719c89e5cb185accf48300ba1d75c63b96 Mon Sep 17 00:00:00 2001
From: Tobias Gunkel
Date: Sun, 22 Jan 2012 23:10:46 +0100
Subject: SCUMM: handle actor freeze in walkToActorOrObject()

---
 engines/scumm/script.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/scumm')

diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index 6dac647714..31eef50a6a 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -1149,9 +1149,9 @@ void ScummEngine_v0::walkToActorOrObject(int object) {
 	VAR(6) = x;
 	VAR(7) = y;
 
-	if (!(a->_miscflags & kActorMiscFlagFreeze)) {
-		// FIXME: walking already started -> should be stopped if condition not true
-		//actorStartWalk();
+	// actor must not move if frozen
+	if (a->_miscflags & kActorMiscFlagFreeze)
+		a->stopActorMoving();
 	}
 }
 
-- 
cgit v1.2.3