diff options
| author | Eric Fry | 2018-06-04 08:03:35 +1000 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-07-20 06:43:33 +0000 |
| commit | 88ef19056915b30d5e4b5d5e0e59ec6c17053d59 (patch) | |
| tree | cab1d48b74119240629e8871e3397771ffb0a738 /engines/illusions/sequenceopcodes.cpp | |
| parent | 7b88bd8efe25fe3092e190d5fed16990c69e2849 (diff) | |
| download | scummvm-rg350-88ef19056915b30d5e4b5d5e0e59ec6c17053d59.tar.gz scummvm-rg350-88ef19056915b30d5e4b5d5e0e59ec6c17053d59.tar.bz2 scummvm-rg350-88ef19056915b30d5e4b5d5e0e59ec6c17053d59.zip | |
ILLUSIONS: Add logic to enable palette cycling sequence
Diffstat (limited to 'engines/illusions/sequenceopcodes.cpp')
| -rw-r--r-- | engines/illusions/sequenceopcodes.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/illusions/sequenceopcodes.cpp b/engines/illusions/sequenceopcodes.cpp index 53c72b9a28..f2de9f2b2d 100644 --- a/engines/illusions/sequenceopcodes.cpp +++ b/engines/illusions/sequenceopcodes.cpp @@ -253,7 +253,7 @@ void SequenceOpcodes::opAppearForeignActor(Control *control, OpCall &opCall) { ARG_INT16(foreignObjectNum); Control *foreignControl = _vm->_dict->getObjectControl(foreignObjectNum | 0x40000); if (!foreignControl) { - Common::Point pos = _vm->getNamedPointPosition(0x00070023); // TODO Eric check this. duckman looks to be using 0x70001 + Common::Point pos = _vm->getNamedPointPosition(_vm->getGameId() == kGameIdDuckman ? 0x00070001 : 0x00070023); _vm->_controls->placeActor(0x00050001, pos, 0x00060001, foreignObjectNum | 0x40000, 0); foreignControl = _vm->_dict->getObjectControl(foreignObjectNum | 0x40000); } @@ -396,20 +396,20 @@ void SequenceOpcodes::opStartScriptThread(Control *control, OpCall &opCall) { } void SequenceOpcodes::opPlaceSubActor(Control *control, OpCall &opCall) { - ARG_INT16(linkIndex); - ARG_UINT32(actorTypeId); - ARG_UINT32(sequenceId); - _vm->_controls->placeSubActor(control->_objectId, linkIndex, actorTypeId, sequenceId); + ARG_INT16(linkIndex); + ARG_UINT32(actorTypeId); + ARG_UINT32(sequenceId); + _vm->_controls->placeSubActor(control->_objectId, linkIndex, actorTypeId, sequenceId); } void SequenceOpcodes::opStartSubSequence(Control *control, OpCall &opCall) { - ARG_INT16(linkIndex); - ARG_UINT32(sequenceId); + ARG_INT16(linkIndex); + ARG_UINT32(sequenceId); control->startSubSequence(linkIndex, sequenceId); } void SequenceOpcodes::opStopSubSequence(Control *control, OpCall &opCall) { - ARG_INT16(linkIndex); + ARG_INT16(linkIndex); control->stopSubSequence(linkIndex); } |