thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MADS: Fixed incorrect parameter order in scene 101 chair sit down

Browse source
This commit is contained in:
Paul Gilbert 2014-04-11 08:19:18 -04:00
parent 4225304a34
commit d8c35b71db
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/mads/nebular/nebular_scenes1.cpp
View file

@ -337,7 +337,7 @@ void Scene101::actions() {
switch (_game._trigger) { switch (_game._trigger) {
case 0: case 0:
_scene->_sequences.remove(_globals._spriteIndexes[27]); _scene->_sequences.remove(_globals._spriteIndexes[27]);
_globals._spriteIndexes[26] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[11], false, 3, 0, 0, 1); _globals._spriteIndexes[26] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[11], false, 3, 1);
_scene->_sequences.setAnimRange(_globals._spriteIndexes[26], 1, 17); _scene->_sequences.setAnimRange(_globals._spriteIndexes[26], 1, 17);
_scene->_sequences.addSubEntry(_globals._spriteIndexes[26], SM_FRAME_INDEX, 10, 1); _scene->_sequences.addSubEntry(_globals._spriteIndexes[26], SM_FRAME_INDEX, 10, 1);
_scene->_sequences.addSubEntry(_globals._spriteIndexes[26], SM_0, 0, 2); _scene->_sequences.addSubEntry(_globals._spriteIndexes[26], SM_0, 0, 2);

8
engines/mads/sequence.cpp
View file

@ -55,7 +55,7 @@ SequenceEntry::SequenceEntry() {
_entries._count = 0; _entries._count = 0;
Common::fill(&_entries._mode[0], &_entries._mode[SEQUENCE_ENTRY_SUBSET_MAX], SM_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._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) if (_entries[index]._entries._count >= SEQUENCE_ENTRY_SUBSET_MAX)
return true; return true;
int subIndex = _entries[index]._entries._count++; int subIndex = _entries[index]._entries._count++;
_entries[index]._entries._mode[subIndex] = mode; _entries[index]._entries._mode[subIndex] = mode;
_entries[index]._entries._frameIndex[subIndex] = frameIndex; _entries[index]._entries._frameIndex[subIndex] = frameIndex;
_entries[index]._entries._abortVal[subIndex] = abortVal; _entries[index]._entries._trigger[subIndex] = trigger;
return false; return false;
} }
@ -325,7 +325,7 @@ bool SequenceList::loadSprites(int seqIndex) {
} }
if (idx >= 0) { if (idx >= 0) {
_vm->_game->_trigger = seqEntry._entries._abortVal[idx]; _vm->_game->_trigger = seqEntry._entries._trigger[idx];
_vm->_game->_triggerMode = seqEntry._triggerMode; _vm->_game->_triggerMode = seqEntry._triggerMode;
if (seqEntry._triggerMode != KERNEL_TRIGGER_DAEMON) if (seqEntry._triggerMode != KERNEL_TRIGGER_DAEMON)

4
engines/mads/sequence.h
View file

@ -42,7 +42,7 @@ struct SequenceSubEntries {
int _count; int _count;
SequenceSubEntryMode _mode[SEQUENCE_ENTRY_SUBSET_MAX]; SequenceSubEntryMode _mode[SEQUENCE_ENTRY_SUBSET_MAX];
int _frameIndex[SEQUENCE_ENTRY_SUBSET_MAX]; int _frameIndex[SEQUENCE_ENTRY_SUBSET_MAX];
int8 _abortVal[SEQUENCE_ENTRY_SUBSET_MAX]; int8 _trigger[SEQUENCE_ENTRY_SUBSET_MAX];
}; };
struct SequenceEntry { struct SequenceEntry {
@ -95,7 +95,7 @@ public:
SequenceEntry &operator[](int index) { return _entries[index]; } SequenceEntry &operator[](int index) { return _entries[index]; }
void clear(); void clear();
bool addSubEntry(int index, SequenceSubEntryMode mode, int frameIndex, int abortVal); bool addSubEntry(int index, SequenceSubEntryMode mode, int frameIndex, int trigger);
int add(int spriteListIndex, bool flipped, int frameIndex, int triggerCountdown, int delayTicks, int add(int spriteListIndex, bool flipped, int frameIndex, int triggerCountdown, int delayTicks,
int extraTicks, int numTicks, int msgX, int msgY, bool nonFixed, char scale, uint8 depth, int extraTicks, int numTicks, int msgX, int msgY, bool nonFixed, char scale, uint8 depth,
int frameInc, SpriteAnimType animType, int numSprites, int frameStart); int frameInc, SpriteAnimType animType, int numSprites, int frameStart);