From b99afecb414421c25cd10bcbbd20eaef74c61b28 Mon Sep 17 00:00:00 2001
From: James Brown
Date: Sun, 3 Nov 2002 07:09:05 +0000
Subject: Fix "I can't reach that" in Indy3

svn-id: r5387
---
 scumm/script_v1.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'scumm/script_v1.cpp')

diff --git a/scumm/script_v1.cpp b/scumm/script_v1.cpp
index 30f50c147c..5170c9b276 100644
--- a/scumm/script_v1.cpp
+++ b/scumm/script_v1.cpp
@@ -1250,10 +1250,17 @@ void Scumm::o5_getActorRoom()
 
 void Scumm::o5_getActorScale()
 {
+	// INDY3 uses this opcode as a wait_for_actor();
 	if (_gameId == GID_INDY3_256) {
-		getVarOrDirectByte(0x80);		/*FIXME: missing stuff here */
-		return;
+	        byte *oldaddr = _scriptPointer - 1;
+
+                if (derefActorSafe(getVarOrDirectByte(0x80), "o5_wait")->moving) {
+	        	_scriptPointer = oldaddr;
+        		o5_breakHere();
+		}
+                return;
 	}
+
 	getResultPos();
 	setResult(derefActorSafe(getVarOrDirectByte(0x80), "o5_getActorScale")->scalex);
 }
-- 
cgit v1.2.3