diff options
| -rw-r--r-- | scumm/intern.h | 1 | ||||
| -rw-r--r-- | scumm/script_v72he.cpp | 8 | ||||
| -rw-r--r-- | scumm/script_v80he.cpp | 2 | ||||
| -rw-r--r-- | scumm/script_v90he.cpp | 2 |
4 files changed, 3 insertions, 10 deletions
diff --git a/scumm/intern.h b/scumm/intern.h index 6fc1b57ee8..166b086c64 100644 --- a/scumm/intern.h +++ b/scumm/intern.h @@ -756,7 +756,6 @@ protected: void o72_unknownC1(); void o72_unknownCF(); void o72_drawWizImage(); - void o72_shuffle(); void o72_jumpToScript(); void o72_openFile(); void o72_readFile(); diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp index fa8927024d..9a0090b3dd 100644 --- a/scumm/script_v72he.cpp +++ b/scumm/script_v72he.cpp @@ -310,7 +310,7 @@ void ScummEngine_v72he::setupOpcodes() { OPCODE(o6_getAnimateVariable), OPCODE(o6_invalid), /* D4 */ - OPCODE(o72_shuffle), + OPCODE(o6_shuffle), OPCODE(o72_jumpToScript), OPCODE(o6_band), OPCODE(o6_bor), @@ -1707,12 +1707,6 @@ void ScummEngine_v72he::o72_unknownCF() { push(readVar(0)); } -void ScummEngine_v72he::o72_shuffle() { - int b = pop(); - int a = pop(); - shuffleArray(fetchScriptWord(), a, b); -} - void ScummEngine_v72he::o72_jumpToScript() { int args[16]; int script, flags; diff --git a/scumm/script_v80he.cpp b/scumm/script_v80he.cpp index 5db388337b..c9f3b283d7 100644 --- a/scumm/script_v80he.cpp +++ b/scumm/script_v80he.cpp @@ -310,7 +310,7 @@ void ScummEngine_v80he::setupOpcodes() { OPCODE(o6_getAnimateVariable), OPCODE(o6_invalid), /* D4 */ - OPCODE(o72_shuffle), + OPCODE(o6_shuffle), OPCODE(o72_jumpToScript), OPCODE(o6_band), OPCODE(o6_bor), diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp index 8052c0d79b..54e0cc4e85 100644 --- a/scumm/script_v90he.cpp +++ b/scumm/script_v90he.cpp @@ -310,7 +310,7 @@ void ScummEngine_v90he::setupOpcodes() { OPCODE(o6_getAnimateVariable), OPCODE(o6_invalid), /* D4 */ - OPCODE(o72_shuffle), + OPCODE(o6_shuffle), OPCODE(o72_jumpToScript), OPCODE(o6_band), OPCODE(o6_bor), |