[Scummvm-cvs-logs] CVS: scummvm/scumm script_v1.cpp,1.11,1.12

[James Brown]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv25439/scumm

Modified Files:
	script_v1.cpp 
Log Message:
Fix "I can't reach that" in Indy3


Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v1.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- script_v1.cpp	22 Sep 2002 03:53:52 -0000	1.11
+++ script_v1.cpp	3 Nov 2002 07:09:05 -0000	1.12
@@ -1250,10 +1250,17 @@
 
 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);
 }