diff options
| author | Max Horn | 2002-12-22 19:14:53 +0000 |
|---|---|---|
| committer | Max Horn | 2002-12-22 19:14:53 +0000 |
| commit | 3ce3a5be5bbfd6f438584e5c09e08d26eadb9396 (patch) | |
| tree | 6b39ba3dfff94290641c614dd0f0620bec182f6c /scumm/script_v5.cpp | |
| parent | 2e66c05f477f0693867173fdc74cf55fc142687f (diff) | |
| download | scummvm-rg350-3ce3a5be5bbfd6f438584e5c09e08d26eadb9396.tar.gz scummvm-rg350-3ce3a5be5bbfd6f438584e5c09e08d26eadb9396.tar.bz2 scummvm-rg350-3ce3a5be5bbfd6f438584e5c09e08d26eadb9396.zip | |
minor cleanup
svn-id: r6059
Diffstat (limited to 'scumm/script_v5.cpp')
| -rw-r--r-- | scumm/script_v5.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/scumm/script_v5.cpp b/scumm/script_v5.cpp index 7c5e1111ff..9d9bfa0776 100644 --- a/scumm/script_v5.cpp +++ b/scumm/script_v5.cpp @@ -162,7 +162,7 @@ void Scumm_v5::setupOpcodes() OPCODE(o5_getClosestObjActor), OPCODE(o5_dummy), /* 68 */ - OPCODE(o5_getScriptRunning), + OPCODE(o5_isScriptRunning), OPCODE(o5_setOwnerOf), OPCODE(o5_startScript), OPCODE(o5_debug), @@ -322,7 +322,7 @@ void Scumm_v5::setupOpcodes() OPCODE(o5_getClosestObjActor), OPCODE(o5_dummy), /* E8 */ - OPCODE(o5_getScriptRunning), + OPCODE(o5_isScriptRunning), OPCODE(o5_setOwnerOf), OPCODE(o5_startScript), OPCODE(o5_debug), @@ -356,6 +356,17 @@ void Scumm_v5::setupOpcodes() _opcodesV5 = opcodes; } +void Scumm_v5::executeOpcode(int i) +{ + OpcodeProcV5 op = _opcodesV5[i].proc; + (this->*op) (); +} + +const char *Scumm_v5::getOpcodeDesc(int i) +{ + return _opcodesV5[i].desc; +} + void Scumm_v5::o5_actorFollowCamera() { actorFollowCamera(getVarOrDirectByte(0x80)); @@ -1137,7 +1148,7 @@ void Scumm_v5::o5_getRandomNr() setResult(_rnd.getRandomNumber(getVarOrDirectByte(0x80))); } -void Scumm_v5::o5_getScriptRunning() +void Scumm_v5::o5_isScriptRunning() { getResultPos(); setResult(isScriptRunning(getVarOrDirectByte(0x80))); |