[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.133,1.134

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv25008

Modified Files:
	script_v6.cpp 
Log Message:
workaround for bug #743363

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- script_v6.cpp	25 May 2003 11:52:30 -0000	1.133
+++ script_v6.cpp	26 May 2003 01:01:47 -0000	1.134
@@ -1083,7 +1083,17 @@
 
 void Scumm_v6::o6_animateActor() {
 	int anim = pop();
-	Actor *a = derefActor(pop(), "o6_animateActor");
+	int act = pop();
+	if (_gameId == GID_TENTACLE && _roomResource == 57 &&
+		vm.slot[_currentScript].number == 19 && act == 593) {
+		// FIXME: This very odd case (animateActor(593,250)) occurs in DOTT, in the
+		// cutscene after George cuts down the "cherry tree" and the tree Laverne
+		// is trapped in vanishes... see bug #743363.
+		// Not sure if this means animateActor somehow also must work for objects
+		// (593 is the time machine in room 57), or if this is simply a script bug.
+		act = 6;
+	}
+	Actor *a = derefActor(act, "o6_animateActor");
 	a->animateActor(anim);
 }