diff options
| author | Max Horn | 2002-12-23 12:50:38 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-23 12:50:38 +0000 |
| commit | e192142dac67b313f8dceb97417ad547e2ad68a3 (patch) | |
| tree | b22675653a5bf9be76f013020035051dc8646402 /scumm/script_v6.cpp | |
| parent | 034bfddd7e0da20dfe0bcc11a08af97fef9c8f7b (diff) | |
| download | scummvm-rg350-e192142dac67b313f8dceb97417ad547e2ad68a3.tar.gz scummvm-rg350-e192142dac67b313f8dceb97417ad547e2ad68a3.tar.bz2 scummvm-rg350-e192142dac67b313f8dceb97417ad547e2ad68a3.zip | |
resolved some arguments with aquadran about how to go on about this :-). Renamed three v6 opcodes
svn-id: r6068
Diffstat (limited to 'scumm/script_v6.cpp')
| -rw-r--r-- | scumm/script_v6.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index af7b9fc77b..20aa5b8a8c 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -74,7 +74,7 @@ void Scumm_v6::setupOpcodes() /* 18 */ OPCODE(o6_land), OPCODE(o6_lor), - OPCODE(o6_kill), + OPCODE(o6_pop), OPCODE(o6_invalid), /* 1C */ OPCODE(o6_invalid), @@ -279,8 +279,8 @@ void Scumm_v6::setupOpcodes() /* BC */ OPCODE(o6_dim), OPCODE(o6_dummy), - OPCODE(o6_runVerbCodeQuick), - OPCODE(o6_runScriptQuick), + OPCODE(o6_startObjectQuick), + OPCODE(o6_startScriptQuick), /* C0 */ OPCODE(o6_dim2), OPCODE(o6_invalid), @@ -616,7 +616,7 @@ void Scumm_v6::o6_band() // Bitwise And push(pop() | a); } -void Scumm_v6::o6_kill() +void Scumm_v6::o6_pop() { pop(); } @@ -2349,7 +2349,7 @@ void Scumm_v6::o6_dummy() /* nothing */ } -void Scumm_v6::o6_runVerbCodeQuick() +void Scumm_v6::o6_startObjectQuick() { int16 args[16]; int script, entryp; @@ -2359,7 +2359,7 @@ void Scumm_v6::o6_runVerbCodeQuick() runVerbCode(script, entryp, 0, 1, args); } -void Scumm_v6::o6_runScriptQuick() +void Scumm_v6::o6_startScriptQuick() { int16 args[16]; int script; |