MADS: Implemented NebularGame::step
This commit is contained in:
parent
d801c2ffdd
commit
71b1343adf
19 changed files with 122 additions and 40 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue