diff options
author | Torbjörn Andersson | 2003-06-13 17:35:44 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2003-06-13 17:35:44 +0000 |
commit | 423ccef9a2ba885c5888856e2e031d4883c8460b (patch) | |
tree | 8338f31a520d1ad147cbdeaaf21e22aad347ffa0 | |
parent | 6bce6b4069cb9ca92d7837be44a5a7751e6ad878 (diff) | |
download | scummvm-rg350-423ccef9a2ba885c5888856e2e031d4883c8460b.tar.gz scummvm-rg350-423ccef9a2ba885c5888856e2e031d4883c8460b.tar.bz2 scummvm-rg350-423ccef9a2ba885c5888856e2e031d4883c8460b.zip |
Hack to avoid bad actor crash in o5_walkActorToActor() when using the camel
in the FOA "wits" path. We have a number of these hacks now...
svn-id: r8460
-rw-r--r-- | scumm/script_v5.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index 0159eb386d..76136442f0 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -2392,6 +2392,16 @@ void Scumm_v5::o5_walkActorToActor() { return; } + if (_gameId == GID_INDY4 && nr == 1 && nr2 == 106 && + dist == 255 && vm.slot[_currentScript].number == 210) { + // FIXME: Work around an invalid actor bug when using the + // camel in Fate of Atlantis, the "wits" path. The room-65-210 + // script contains this: walkActorToActor(1,106,255) + // Once more this is either a script bug, or there is + // some hidden meaning in this odd walk request? + return; + } + a = derefActor(nr, "o5_walkActorToActor"); if (!a->isInCurrentRoom()) return; |