From 02ac724c660133765c9c63db8768590c58bea897 Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Wed, 15 Feb 2017 17:03:54 +1100
Subject: SCUMM: MM V0: Fix an issue with Sandy appearing to slide across a
 walkbox

---
 engines/scumm/actor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 8465526243..f888c69ac2 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -2416,6 +2416,7 @@ void Actor_v0::startAnimActor(int f) {
 			return;
 
 		_speaking = 1;
+		speakCheck();
 		return;
 	}
 
-- 
cgit v1.2.3


From 038b3b178939f1bcc6714eda1b88c3e80e787c02 Mon Sep 17 00:00:00 2001
From: Robert Crossfield
Date: Tue, 21 Feb 2017 06:17:32 +1100
Subject: SCUMM: MM V0: Fix actors skipping between certain walk-boxes

---
 engines/scumm/actor.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index f888c69ac2..5b7e14406a 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -937,7 +937,6 @@ L2A33:;
 	}
 
 	if ((_moving & 0x0F) == 3) {
-L2C36:;
 		setTmpFromActor();
 
 		if (!_walkDirX) {
@@ -980,7 +979,6 @@ L2C36:;
 
 	// 2ADA
 	if ((_moving & 0x0F) == 4) {
-L2CA3:;
 		setTmpFromActor();
 
 		if (!_walkDirY) {
@@ -1045,7 +1043,7 @@ L2CA3:;
 
 				directionUpdate();
 				animateActor(newDirToOldDir(_facing));
-				goto L2C36;
+				return;
 
 			} else {
 				// 2B39
@@ -1064,7 +1062,7 @@ L2CA3:;
 
 				directionUpdate();
 				animateActor(newDirToOldDir(_facing));
-				goto L2CA3;
+				return;
 			}
 		}
 	}
-- 
cgit v1.2.3