diff options
author | Travis Howell | 2009-04-21 04:42:45 +0000 |
---|---|---|
committer | Travis Howell | 2009-04-21 04:42:45 +0000 |
commit | acc86f5c62b12345c15a9fe9c79aee1d17736ae1 (patch) | |
tree | 4a7498f05d06a6a22062b0b2f2bf83c45b1d17a8 /engines/scumm | |
parent | 3eab407cd58103e5246e47b7945f9b5428e3558c (diff) | |
download | scummvm-rg350-acc86f5c62b12345c15a9fe9c79aee1d17736ae1.tar.gz scummvm-rg350-acc86f5c62b12345c15a9fe9c79aee1d17736ae1.tar.bz2 scummvm-rg350-acc86f5c62b12345c15a9fe9c79aee1d17736ae1.zip |
Fix regression in SCUMM0, by calling ScummEngine::fetchScriptWord() directly. Since fetchScriptWordSigned(), still uses the overloaded fetchScriptWord() function.
svn-id: r40033
Diffstat (limited to 'engines/scumm')
-rw-r--r-- | engines/scumm/script_v5.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp index 191826f492..12e9f9e820 100644 --- a/engines/scumm/script_v5.cpp +++ b/engines/scumm/script_v5.cpp @@ -378,11 +378,7 @@ int ScummEngine_v5::getVarOrDirectWord(byte mask) { } void ScummEngine_v5::jumpRelative(bool cond) { - // We explicitly call ScummEngine::fetchScriptWordSigned() - // 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::fetchScriptWordSigned(); + int16 offset = ScummEngine::fetchScriptWord(); if (!cond) _scriptPointer += offset; } |