diff options
| author | Tobias Gunkel | 2012-01-29 17:11:54 +0100 |
|---|---|---|
| committer | Tobias Gunkel | 2012-02-11 08:29:52 +0100 |
| commit | 984c2a05e4e4ec643c1135c6b087f6e7faf1997f (patch) | |
| tree | 64a11454410530323743d86cae3ae7e5ba1bba54 /engines/scumm/script_v2.cpp | |
| parent | d4ddd2ca840fc91cd75cdb4545db30f2f0a78722 (diff) | |
| download | scummvm-rg350-984c2a05e4e4ec643c1135c6b087f6e7faf1997f.tar.gz scummvm-rg350-984c2a05e4e4ec643c1135c6b087f6e7faf1997f.tar.bz2 scummvm-rg350-984c2a05e4e4ec643c1135c6b087f6e7faf1997f.zip | |
SCUMM: replace o_beginOverride() with o2_beginOverride()
In contrast to the comment in o_beginOverride() VAR(VAR_OVERRIDE) is not set in the disassembly. In addition the cutscene stack-pointer is always 0 as this feature is not used in v0. This makes o_beginOverride() work the same way o2_beginOverride() and so it is not needed anymore.
Note that fetchScriptWord() was changed to ScummEngine::fetchScriptWord() in o2_beginOverride() as ScummEngine_v0::fetchScriptWord() only fetches a byte.
As we need two bytes here we have to use ScummEngine::fetchScriptWord().
Diffstat (limited to 'engines/scumm/script_v2.cpp')
| -rw-r--r-- | engines/scumm/script_v2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp index 2b2bad32a7..6857f8635b 100644 --- a/engines/scumm/script_v2.cpp +++ b/engines/scumm/script_v2.cpp @@ -1527,7 +1527,7 @@ void ScummEngine_v2::o2_beginOverride() { // Skip the jump instruction following the override instruction fetchScriptByte(); - fetchScriptWord(); + ScummEngine::fetchScriptWord(); } void ScummEngine_v2::o2_chainScript() { |