diff options
| author | Max Horn | 2003-05-21 14:00:19 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-21 14:00:19 +0000 |
| commit | e21604663fa71426bef8fad528626a4ef17d131a (patch) | |
| tree | d6e434e74b556ec677740b74292c84dba947f422 /scumm/script_v5.cpp | |
| parent | 1294eb35c773c195633474dc2fbb8812f4b949a6 (diff) | |
| download | scummvm-rg350-e21604663fa71426bef8fad528626a4ef17d131a.tar.gz scummvm-rg350-e21604663fa71426bef8fad528626a4ef17d131a.tar.bz2 scummvm-rg350-e21604663fa71426bef8fad528626a4ef17d131a.zip | |
added v2 cutscene support (not quite complete; and crashes at some point in maniac because VAR_EGO contains a bogus value); cleanup
svn-id: r7781
Diffstat (limited to 'scumm/script_v5.cpp')
| -rw-r--r-- | scumm/script_v5.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index b3cf4a1522..2a81d7d8b9 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -143,7 +143,7 @@ void Scumm_v5::setupOpcodes() { OPCODE(o5_getActorMoving), OPCODE(o5_or), /* 58 */ - OPCODE(o5_overRide), + OPCODE(o5_beginOverride), OPCODE(o5_doSentence), OPCODE(o5_add), OPCODE(o5_divide), @@ -1412,7 +1412,7 @@ void Scumm_v5::o5_or() { setResult(readVar(_resultVarNumber) | a); } -void Scumm_v5::o5_overRide() { +void Scumm_v5::o5_beginOverride() { if (fetchScriptByte() != 0) beginOverride(); else |