aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorTravis Howell2009-04-21 04:48:50 +0000
committerTravis Howell2009-04-21 04:48:50 +0000
commit64fef497dfae0dd5cf96d7b57ab2313525404b12 (patch)
treeb21b90a3d3ab63b4b14c9d4ddecbd02c557be9dd /engines/scumm
parentacc86f5c62b12345c15a9fe9c79aee1d17736ae1 (diff)
downloadscummvm-rg350-64fef497dfae0dd5cf96d7b57ab2313525404b12.tar.gz
scummvm-rg350-64fef497dfae0dd5cf96d7b57ab2313525404b12.tar.bz2
scummvm-rg350-64fef497dfae0dd5cf96d7b57ab2313525404b12.zip
Ooops, keep that comment.
svn-id: r40034
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/script_v5.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 12e9f9e820..45fe6a9022 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -378,6 +378,10 @@ int ScummEngine_v5::getVarOrDirectWord(byte mask) {
}
void ScummEngine_v5::jumpRelative(bool cond) {
+ // We explicitly call ScummEngine::fetchScriptWord()
+ // to make this method work also in v0, which overloads
+ // fetchScriptWord to only read bytes (which is the right thing
+ // to do for most opcodes, but not for jump offsets).
int16 offset = ScummEngine::fetchScriptWord();
if (!cond)
_scriptPointer += offset;