diff options
| author | Paul Gilbert | 2014-03-29 11:18:07 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-03-29 11:18:07 -0400 |
| commit | 71b1343adf6e886cfd2e1a0040a12b5025672d14 (patch) | |
| tree | f21fb355b8fc2aeab61b8078c929a29f43decc26 /engines/mads/sequence.cpp | |
| parent | d801c2ffdd1b2e5cfefcea18309a4779e0a824a1 (diff) | |
| download | scummvm-rg350-71b1343adf6e886cfd2e1a0040a12b5025672d14.tar.gz scummvm-rg350-71b1343adf6e886cfd2e1a0040a12b5025672d14.tar.bz2 scummvm-rg350-71b1343adf6e886cfd2e1a0040a12b5025672d14.zip | |
MADS: Implemented NebularGame::step
Diffstat (limited to 'engines/mads/sequence.cpp')
| -rw-r--r-- | engines/mads/sequence.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/mads/sequence.cpp b/engines/mads/sequence.cpp index 9a8e2c62e6..6b9bd9e017 100644 --- a/engines/mads/sequence.cpp +++ b/engines/mads/sequence.cpp @@ -47,7 +47,7 @@ SequenceEntry::SequenceEntry() { _field22 = 0; _triggerCountdown = 0; _doneFlag = 0; - _abortMode = ABORTMODE_0; + _abortMode = KERNEL_TRIGGER_PARSER; _numTicks = 0; _extraTicks = 0; _timeout = 0; @@ -135,7 +135,7 @@ int SequenceList::add(int spriteListIndex, bool flipped, int frameIndex, int tri _entries[seqIndex]._flags = 0; _entries[seqIndex]._dynamicHotspotIndex = -1; _entries[seqIndex]._entries._count = 0; - _entries[seqIndex]._abortMode = _vm->_game->_abortTimersMode2; + _entries[seqIndex]._abortMode = _vm->_game->_triggerSetupMode; _entries[seqIndex]._actionNouns = _vm->_game->_scene._action._activeAction; @@ -160,7 +160,7 @@ int SequenceList::addTimer(int time, int abortVal) { se._triggerCountdown = true; se._doneFlag = false; se._entries._count = 0; - se._abortMode = _vm->_game->_abortTimersMode2; + se._abortMode = _vm->_game->_triggerSetupMode; se._actionNouns = _vm->_game->_scene._action._activeAction; addSubEntry(seqIndex, SM_0, 0, abortVal); @@ -328,9 +328,9 @@ bool SequenceList::loadSprites(int seqIndex) { if (idx >= 0) { _vm->_game->_trigger = seqEntry._entries._abortVal[idx]; - _vm->_game->_abortTimersMode = seqEntry._abortMode; + _vm->_game->_triggerMode = seqEntry._abortMode; - if (seqEntry._abortMode == ABORTMODE_1) + if (seqEntry._abortMode == KERNEL_TRIGGER_DAEMON) scene._action._activeAction = seqEntry._actionNouns; } |