aboutsummaryrefslogtreecommitdiff
path: root/engines/illusions/sequenceopcodes.cpp
diff options
context:
space:
mode:
authorjohndoe1232014-04-07 12:58:26 +0200
committerEugene Sandulenko2018-07-20 06:43:33 +0000
commit3f15233f78a264e45ce74ecd2db9ed3119b1b654 (patch)
tree821bda821f8b1d0813e271d682c5c42b59103c59 /engines/illusions/sequenceopcodes.cpp
parent6ba5570de52344da602cf02fb83725b468e3d8c5 (diff)
downloadscummvm-rg350-3f15233f78a264e45ce74ecd2db9ed3119b1b654.tar.gz
scummvm-rg350-3f15233f78a264e45ce74ecd2db9ed3119b1b654.tar.bz2
scummvm-rg350-3f15233f78a264e45ce74ecd2db9ed3119b1b654.zip
ILLUSIONS: Refactor code in preparation for the Duckman engine
Diffstat (limited to 'engines/illusions/sequenceopcodes.cpp')
-rw-r--r--engines/illusions/sequenceopcodes.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/engines/illusions/sequenceopcodes.cpp b/engines/illusions/sequenceopcodes.cpp
index 818b6816a1..f020423a1a 100644
--- a/engines/illusions/sequenceopcodes.cpp
+++ b/engines/illusions/sequenceopcodes.cpp
@@ -99,11 +99,6 @@ void SequenceOpcodes::freeOpcodes() {
// Opcodes
-// Convenience macros
-#define ARG_SKIP(x) opCall.skip(x);
-#define ARG_INT16(name) int16 name = opCall.readSint16(); debug(1, "ARG_INT16(" #name " = %d)", name);
-#define ARG_UINT32(name) uint32 name = opCall.readUint32(); debug(1, "ARG_UINT32(" #name " = %08X)", name);
-
void SequenceOpcodes::opYield(Control *control, OpCall &opCall) {
opCall._result = 2;
}
@@ -138,7 +133,7 @@ void SequenceOpcodes::opEndSequence(Control *control, OpCall &opCall) {
control->_actor->_frames = 0;
control->_actor->_frameIndex = 0;
control->_actor->_newFrameIndex = 0;
- // TODO _vm->_resSys->unloadResourceById(control->_actor->_sequenceId);
+ _vm->_resSys->unloadResourceById(control->_actor->_sequenceId);
}
_vm->notifyThreadId(control->_actor->_notifyThreadId1);
opCall._result = 1;
@@ -321,7 +316,7 @@ void SequenceOpcodes::opStopSound(Control *control, OpCall &opCall) {
void SequenceOpcodes::opStartScriptThread(Control *control, OpCall &opCall) {
ARG_SKIP(2);
ARG_UINT32(threadId);
- _vm->_scriptMan->startScriptThread(threadId, 0, 0, 0, 0);
+ _vm->startScriptThreadSimple(threadId, 0);
}
void SequenceOpcodes::opPlaceSubActor(Control *control, OpCall &opCall) {