diff options
| author | Max Horn | 2003-05-26 01:01:47 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-26 01:01:47 +0000 |
| commit | c70713ea4adca4601746c14097cb725461f22dc3 (patch) | |
| tree | 98ea225ce47bb1562af47c0c2806ec788bcbedd5 | |
| parent | c5ea0839ef3672f92c088ab3db9853eeebd88fa3 (diff) | |
| download | scummvm-rg350-c70713ea4adca4601746c14097cb725461f22dc3.tar.gz scummvm-rg350-c70713ea4adca4601746c14097cb725461f22dc3.tar.bz2 scummvm-rg350-c70713ea4adca4601746c14097cb725461f22dc3.zip | |
workaround for bug #743363
svn-id: r7980
| -rw-r--r-- | scumm/script_v6.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index 430c2e7a2b..3ced617074 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -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); } |