aboutsummaryrefslogtreecommitdiff
path: root/engines/mads
diff options
context:
space:
mode:
authorPaul Gilbert2014-04-05 15:56:24 -0400
committerPaul Gilbert2014-04-05 15:56:24 -0400
commitecdaf23344725c4bddf5e3dddf80d56140374013 (patch)
treefd99ede21a052076cf415e481272696cd56ca188 /engines/mads
parent06aeba275acb80df86ff103880c07ccc0e9738b1 (diff)
downloadscummvm-rg350-ecdaf23344725c4bddf5e3dddf80d56140374013.tar.gz
scummvm-rg350-ecdaf23344725c4bddf5e3dddf80d56140374013.tar.bz2
scummvm-rg350-ecdaf23344725c4bddf5e3dddf80d56140374013.zip
MADS: Fix to stop daemon actions overwriting currently active player actions
Diffstat (limited to 'engines/mads')
-rw-r--r--engines/mads/sequence.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/mads/sequence.cpp b/engines/mads/sequence.cpp
index 5150b75c25..92cba84718 100644
--- a/engines/mads/sequence.cpp
+++ b/engines/mads/sequence.cpp
@@ -330,7 +330,7 @@ bool SequenceList::loadSprites(int seqIndex) {
_vm->_game->_trigger = seqEntry._entries._abortVal[idx];
_vm->_game->_triggerMode = seqEntry._triggerMode;
- if (seqEntry._triggerMode == KERNEL_TRIGGER_DAEMON)
+ if (seqEntry._triggerMode != KERNEL_TRIGGER_DAEMON)
scene._action._activeAction = seqEntry._actionNouns;
}