thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

workaround for bug #743363

Browse source 
svn-id: r7980
This commit is contained in:
Max Horn 2003-05-26 01:01:47 +00:00
parent c5ea0839ef
commit c70713ea4a
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
scumm/script_v6.cpp
View file

@ -1083,7 +1083,17 @@ void Scumm_v6::o6_faceActor() {
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);
}