aboutsummaryrefslogtreecommitdiff
path: root/scumm/script_v5.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2006-01-18 11:53:07 +0000
committerTorbjörn Andersson2006-01-18 11:53:07 +0000
commit34d835e4a263f6cc0be68da94cca40c803dd9532 (patch)
treeacda69073f4c5467392209f98036c46e60ef3022 /scumm/script_v5.cpp
parent791b5bdc6175fb3f15dbc4f10d643ac3596228e9 (diff)
downloadscummvm-rg350-34d835e4a263f6cc0be68da94cca40c803dd9532.tar.gz
scummvm-rg350-34d835e4a263f6cc0be68da94cca40c803dd9532.tar.bz2
scummvm-rg350-34d835e4a263f6cc0be68da94cca40c803dd9532.zip
Work around a script bug in Full Throttle. See bug #1407789.
svn-id: r20080
Diffstat (limited to 'scumm/script_v5.cpp')
-rw-r--r--scumm/script_v5.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp
index 382d0f28f0..a55094614b 100644
--- a/scumm/script_v5.cpp
+++ b/scumm/script_v5.cpp
@@ -1052,7 +1052,7 @@ void ScummEngine_v5::o5_getActorRoom() {
// WORKAROUND bug #746349. This is a really odd bug in either the script
// or in our script engine. Might be a good idea to investigate this
// further by e.g. looking at the FOA engine a bit closer.
- if (_gameId == GID_INDY4 && _roomResource == 94 && vm.slot[_currentScript].number == 206 && act > _numActors) {
+ if (_gameId == GID_INDY4 && _roomResource == 94 && vm.slot[_currentScript].number == 206 && !isValidActor(act)) {
setResult(0);
return;
}