diff options
| author | Paul Gilbert | 2014-04-11 08:19:18 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2014-04-11 08:19:18 -0400 |
| commit | d8c35b71dbd310d2012d501529867faab4875b29 (patch) | |
| tree | c96977395d6a34a05e9949e0f97b6acc5b9cf158 /engines/mads/sequence.cpp | |
| parent | 4225304a34a5fc04280e72206c4d3dea13e29ad8 (diff) | |
| download | scummvm-rg350-d8c35b71dbd310d2012d501529867faab4875b29.tar.gz scummvm-rg350-d8c35b71dbd310d2012d501529867faab4875b29.tar.bz2 scummvm-rg350-d8c35b71dbd310d2012d501529867faab4875b29.zip | |
MADS: Fixed incorrect parameter order in scene 101 chair sit down
Diffstat (limited to 'engines/mads/sequence.cpp')
| -rw-r--r-- | engines/mads/sequence.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/mads/sequence.cpp b/engines/mads/sequence.cpp index fa6d745675..409dc303fe 100644 --- a/engines/mads/sequence.cpp +++ b/engines/mads/sequence.cpp @@ -55,7 +55,7 @@ SequenceEntry::SequenceEntry() { _entries._count = 0; Common::fill(&_entries._mode[0], &_entries._mode[SEQUENCE_ENTRY_SUBSET_MAX], SM_0); Common::fill(&_entries._frameIndex[0], &_entries._frameIndex[SEQUENCE_ENTRY_SUBSET_MAX], 0); - Common::fill(&_entries._abortVal[0], &_entries._abortVal[SEQUENCE_ENTRY_SUBSET_MAX], 0); + Common::fill(&_entries._trigger[0], &_entries._trigger[SEQUENCE_ENTRY_SUBSET_MAX], 0); } /*------------------------------------------------------------------------*/ @@ -80,14 +80,14 @@ void SequenceList::clear() { } } -bool SequenceList::addSubEntry(int index, SequenceSubEntryMode mode, int frameIndex, int abortVal) { +bool SequenceList::addSubEntry(int index, SequenceSubEntryMode mode, int frameIndex, int trigger) { if (_entries[index]._entries._count >= SEQUENCE_ENTRY_SUBSET_MAX) return true; int subIndex = _entries[index]._entries._count++; _entries[index]._entries._mode[subIndex] = mode; _entries[index]._entries._frameIndex[subIndex] = frameIndex; - _entries[index]._entries._abortVal[subIndex] = abortVal; + _entries[index]._entries._trigger[subIndex] = trigger; return false; } @@ -325,7 +325,7 @@ bool SequenceList::loadSprites(int seqIndex) { } if (idx >= 0) { - _vm->_game->_trigger = seqEntry._entries._abortVal[idx]; + _vm->_game->_trigger = seqEntry._entries._trigger[idx]; _vm->_game->_triggerMode = seqEntry._triggerMode; if (seqEntry._triggerMode != KERNEL_TRIGGER_DAEMON) |