diff options
| author | whiterandrek | 2018-06-17 19:12:28 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-06-28 23:51:32 +0200 |
| commit | 4aa908860b12a4b341937d3fa8a5dce23ba2a396 (patch) | |
| tree | 74fbd33a35dadee9e8b086df51c5eb6cf40868e6 /engines/pink/objects/sequences/sequence_item.cpp | |
| parent | 9b8d72bfb53ce7b9eacc435f540b2b956f6fb759 (diff) | |
| download | scummvm-rg350-4aa908860b12a4b341937d3fa8a5dce23ba2a396.tar.gz scummvm-rg350-4aa908860b12a4b341937d3fa8a5dce23ba2a396.tar.bz2 scummvm-rg350-4aa908860b12a4b341937d3fa8a5dce23ba2a396.zip | |
PINK: add Hokus Pokus scripting system
Diffstat (limited to 'engines/pink/objects/sequences/sequence_item.cpp')
| -rw-r--r-- | engines/pink/objects/sequences/sequence_item.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/pink/objects/sequences/sequence_item.cpp b/engines/pink/objects/sequences/sequence_item.cpp index cd21a100da..72fb452432 100644 --- a/engines/pink/objects/sequences/sequence_item.cpp +++ b/engines/pink/objects/sequences/sequence_item.cpp @@ -51,8 +51,9 @@ bool SequenceItem::execute(int index, Sequence *sequence, bool unk2) { actor->setAction(action, unk2); - SequenceActorState *state = sequence->_sequencer->findSequenceActorState(_actor); - state->_index = index; + SequenceActorState *state = sequence->_sequencer->findMainSequenceActorState(_actor); + if (state) + state->_index = index; sequence->_context->_actor = isLeader() ? actor : sequence->_context->_actor; return true; @@ -81,7 +82,7 @@ void SequenceItemLeaderAudio::toConsole() { } bool SequenceItemDefaultAction::execute(int index, Sequence *sequence, bool unk2) { - SequenceActorState *state = sequence->_sequencer->findSequenceActorState(_actor); + SequenceActorState *state = sequence->_sequencer->findMainSequenceActorState(_actor); state->_actionName = _action; return true; } |