diff options
author | Max Horn | 2002-12-26 23:24:57 +0000 |
---|---|---|
committer | Max Horn | 2002-12-26 23:24:57 +0000 |
commit | 8f0af0d2f8b0d7f843fcfbae4ffb507ed5696cdc (patch) | |
tree | 1a0866ae6b2caaf20b846b10a6d873f6304a17fc /scumm/script_v6.cpp | |
parent | c05a308fad833ec57101a9ec704db0f9b5533fd8 (diff) | |
download | scummvm-rg350-8f0af0d2f8b0d7f843fcfbae4ffb507ed5696cdc.tar.gz scummvm-rg350-8f0af0d2f8b0d7f843fcfbae4ffb507ed5696cdc.tar.bz2 scummvm-rg350-8f0af0d2f8b0d7f843fcfbae4ffb507ed5696cdc.zip |
group startScript/Object codes (no code change)
svn-id: r6180
Diffstat (limited to 'scumm/script_v6.cpp')
-rw-r--r-- | scumm/script_v6.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp index c44477cf01..800405e540 100644 --- a/scumm/script_v6.cpp +++ b/scumm/script_v6.cpp @@ -163,7 +163,7 @@ void Scumm_v6::setupOpcodes() OPCODE(o6_startScriptEx), OPCODE(o6_startScript), /* 60 */ - OPCODE(o6_startObject), + OPCODE(o6_startObjectEx), OPCODE(o6_setObjectState), OPCODE(o6_setObjectXY), OPCODE(o6_drawBlastObject), @@ -737,7 +737,7 @@ void Scumm_v6::o6_jumpToScript() getStackList(args, sizeof(args) / sizeof(args[0])); script = pop(); flags = pop(); - o6_stopObjectCode(); + stopObjectCode(); runScript(script, flags & 1, flags & 2, args); } @@ -750,7 +750,16 @@ void Scumm_v6::o6_startScript() runScript(script, 0, 0, args); } -void Scumm_v6::o6_startObject() +void Scumm_v6::o6_startScriptQuick() +{ + int args[16]; + int script; + getStackList(args, sizeof(args) / sizeof(args[0])); + script = pop(); + runScript(script, 0, 1, args); +} + +void Scumm_v6::o6_startObjectEx() { int args[16]; int script, entryp; @@ -762,6 +771,16 @@ void Scumm_v6::o6_startObject() runVerbCode(script, entryp, flags & 1, flags & 2, args); } +void Scumm_v6::o6_startObjectQuick() +{ + int args[16]; + int script, entryp; + getStackList(args, sizeof(args) / sizeof(args[0])); + entryp = pop(); + script = pop(); + runVerbCode(script, entryp, 0, 1, args); +} + void Scumm_v6::o6_setObjectState() { int a = pop(); @@ -2328,25 +2347,6 @@ void Scumm_v6::o6_dummy() /* nothing */ } -void Scumm_v6::o6_startObjectQuick() -{ - int args[16]; - int script, entryp; - getStackList(args, sizeof(args) / sizeof(args[0])); - entryp = pop(); - script = pop(); - runVerbCode(script, entryp, 0, 1, args); -} - -void Scumm_v6::o6_startScriptQuick() -{ - int args[16]; - int script; - getStackList(args, sizeof(args) / sizeof(args[0])); - script = pop(); - runScript(script, 0, 1, args); -} - void Scumm_v6::o6_dim2() { int a, b, data; |