diff options
| author | Max Horn | 2003-10-26 12:09:08 +0000 |
|---|---|---|
| committer | Max Horn | 2003-10-26 12:09:08 +0000 |
| commit | 93c533e30e7fecb9ef4b2f660d4a7ef9737fcf51 (patch) | |
| tree | 57386201a0dc0441a2a7a5d4c7979117c72ee36a /scumm | |
| parent | 3f6f1e3311827a4fff75b2a01cc6a41edea4b028 (diff) | |
| download | scummvm-rg350-93c533e30e7fecb9ef4b2f660d4a7ef9737fcf51.tar.gz scummvm-rg350-93c533e30e7fecb9ef4b2f660d4a7ef9737fcf51.tar.bz2 scummvm-rg350-93c533e30e7fecb9ef4b2f660d4a7ef9737fcf51.zip | |
workaround for bug #820357 (FOA: Talk to Sophia -> Atlantis/Great Machine = crash)
svn-id: r10974
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script_v5.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index f3a96b8817..c0eaade94e 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -595,6 +595,13 @@ void ScummEngine_v5::o5_and() { void ScummEngine_v5::o5_animateActor() { int act = getVarOrDirectByte(0x80); int anim = getVarOrDirectByte(0x40); + + // WORKAROUND bug #820357: This seems to be yet another script bug which + // the original engine let slip by. For details, refer to the tracker item. + if (_gameId == GID_INDY4 && vm.slot[_currentScript].number == 206 && _currentRoom == 17 && (act == 31 || act == 86)) { + return; + } + Actor *a = derefActor(act, "o5_animateActor"); a->animateActor(anim); } |