diff options
| -rw-r--r-- | scumm/intern.h | 2 | ||||
| -rw-r--r-- | scumm/script_v6he.cpp | 21 | ||||
| -rw-r--r-- | scumm/script_v7he.cpp | 4 |
3 files changed, 4 insertions, 23 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index 2a498b0a47..3cfb92acba 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -570,8 +570,6 @@ protected: virtual void decodeParseString(int a, int b); /* Version 6 script opcodes */ - void o6_drawBlastObject(); - void o6_setBlastObjectWindow(); void o6_setState(); void o6_roomOps(); void o6_actorOps(); diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp index f1e26732f2..e62ffdad52 100644 --- a/scumm/script_v6he.cpp +++ b/scumm/script_v6he.cpp @@ -174,9 +174,9 @@ void ScummEngine_v6he::setupOpcodes() { OPCODE(o6_startObject), OPCODE(o6_drawObject), OPCODE(o6_drawObjectAt), - OPCODE(o6_drawBlastObject), + OPCODE(o6_invalid), /* 64 */ - OPCODE(o6_setBlastObjectWindow), + OPCODE(o6_invalid), OPCODE(o6_stopObjectCode), OPCODE(o6_stopObjectCode), OPCODE(o6_endCutscene), @@ -741,23 +741,6 @@ void ScummEngine_v6he::o6_dummy() { stopObjectCode(); } -void ScummEngine_v6he::o6_drawBlastObject() { - int args[16]; - getStackList(args, ARRAYSIZE(args)); - pop(); - pop(); - pop(); - pop(); - pop(); -} - -void ScummEngine_v6he::o6_setBlastObjectWindow() { - pop(); - pop(); - pop(); - pop(); -} - void ScummEngine_v6he::o6_kernelSetFunctions() { int args[29]; int num; diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp index cfcc05d166..cdea4b96e0 100644 --- a/scumm/script_v7he.cpp +++ b/scumm/script_v7he.cpp @@ -175,9 +175,9 @@ void ScummEngine_v7he::setupOpcodes() { OPCODE(o6_startObject), OPCODE(o6_drawObject), OPCODE(o6_drawObjectAt), - OPCODE(o6_drawBlastObject), + OPCODE(o6_invalid), /* 64 */ - OPCODE(o6_setBlastObjectWindow), + OPCODE(o6_invalid), OPCODE(o6_stopObjectCode), OPCODE(o6_stopObjectCode), OPCODE(o6_endCutscene), |