From b5167ceef64e225217bf2c02e1a72e7cc85c4145 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Thu, 15 Oct 2015 11:46:11 +0200 Subject: MADS: Phantom: Fix calls to addSpriteCycle, remove duplicated sequence function --- engines/mads/phantom/phantom_scenes1.cpp | 18 +++++++++--------- engines/mads/sequence.cpp | 5 ----- engines/mads/sequence.h | 1 - 3 files changed, 9 insertions(+), 15 deletions(-) (limited to 'engines') diff --git a/engines/mads/phantom/phantom_scenes1.cpp b/engines/mads/phantom/phantom_scenes1.cpp index 979f97854d..5cb811a236 100644 --- a/engines/mads/phantom/phantom_scenes1.cpp +++ b/engines/mads/phantom/phantom_scenes1.cpp @@ -1163,7 +1163,7 @@ void Scene103::step() { switch (_game._trigger) { case 65: _scene->deleteSequence(_globals._sequenceIndexes[1]); - _globals._sequenceIndexes[1] = _scene->_sequences.addBackwardSequence(_globals._spriteIndexes[1], false, 8, 0, 0, 1); + _globals._sequenceIndexes[1] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[1], false, 8, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[1], 14); _scene->_sequences.setRange(_globals._sequenceIndexes[1], 1, 6); _scene->_sequences.setTrigger(_globals._sequenceIndexes[1], 0, 0, 66); @@ -1192,7 +1192,7 @@ void Scene103::step() { switch (_game._trigger) { case 100: _scene->deleteSequence(_globals._sequenceIndexes[10]); - _globals._sequenceIndexes[10] = _scene->_sequences.addBackwardSequence(_globals._spriteIndexes[10], false, 6, 0, 0, 1); + _globals._sequenceIndexes[10] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[10], false, 6, 1); _scene->_sequences.setTrigger(_globals._sequenceIndexes[10], 0, 0, 101); _scene->_sequences.setRange(_globals._sequenceIndexes[10], -1, -2); _scene->_sequences.setDepth(_globals._sequenceIndexes[10], 4); @@ -1218,7 +1218,7 @@ void Scene103::step() { _guardFrameFl = true; _scene->deleteSequence(_globals._sequenceIndexes[0]); _scene->deleteSequence(_globals._sequenceIndexes[9]); - _globals._sequenceIndexes[0] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[0], false, 6, 0, 0, 1); + _globals._sequenceIndexes[0] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[0], false, 6, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[0], 14); _scene->_sequences.setRange(_globals._sequenceIndexes[0], -1, -2); _scene->_sequences.setTrigger(_globals._sequenceIndexes[0], 0, 0, 105); @@ -1229,7 +1229,7 @@ void Scene103::step() { _guardFrameFl = true; _scene->deleteSequence(_globals._sequenceIndexes[0]); _scene->deleteSequence(_globals._sequenceIndexes[9]); - _globals._sequenceIndexes[0] = _scene->_sequences.addBackwardSequence(_globals._spriteIndexes[0], false, 6, 0, 0, 1); + _globals._sequenceIndexes[0] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[0], false, 6, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[0], 14); _scene->_sequences.setRange(_globals._sequenceIndexes[0], -1, -2); _scene->_sequences.setTrigger(_globals._sequenceIndexes[0], 0, 0, 110); @@ -1627,7 +1627,7 @@ void Scene103::actions() { case 70: _vm->_sound->command(24); _scene->deleteSequence(_globals._sequenceIndexes[1]); - _globals._sequenceIndexes[1] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[1], false, 8, 0, 0, 1); + _globals._sequenceIndexes[1] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[1], false, 8, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[1], 14); _scene->_sequences.setRange(_globals._sequenceIndexes[1], -1, -2); _scene->_sequences.setTrigger(_globals._sequenceIndexes[1], 0, 0, 71); @@ -1650,7 +1650,7 @@ void Scene103::actions() { case (0): _game._player._stepEnabled = false; _game._player._visible = false; - _globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], false, 5, 0, 0, 1); + _globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], false, 5, 1); _scene->_sequences.setRange(_globals._sequenceIndexes[2], 1, 4); _scene->_sequences.setSeqPlayer(_globals._sequenceIndexes[2], true); _scene->_sequences.setTrigger(_globals._sequenceIndexes[2], 0, 0, 1); @@ -1668,7 +1668,7 @@ void Scene103::actions() { case 2: _scene->deleteSequence(_globals._sequenceIndexes[2]); - _globals._sequenceIndexes[2] = _scene->_sequences.addBackwardSequence(_globals._spriteIndexes[2], false, 5, 0, 0, 1); + _globals._sequenceIndexes[2] = _scene->_sequences.addReverseSpriteCycle(_globals._spriteIndexes[2], false, 5, 1); _scene->_sequences.setRange(_globals._sequenceIndexes[2], 1, 4); _scene->_sequences.setSeqPlayer(_globals._sequenceIndexes[2], false); _scene->_sequences.setTrigger(_globals._sequenceIndexes[2], 0, 0, 3); @@ -1763,7 +1763,7 @@ void Scene103::actions() { _anim3ActvFl = false; _climbThroughTrapFl = false; _game._player._stepEnabled = false; - _globals._sequenceIndexes[11] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[11], false, 6, 0, 0, 1); + _globals._sequenceIndexes[11] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[11], false, 6, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[11], 5); _scene->_sequences.setRange(_globals._sequenceIndexes[11], -1, -2); _scene->_sequences.setTrigger(_globals._sequenceIndexes[11], 0, 0, 1); @@ -1790,7 +1790,7 @@ void Scene103::actions() { _scene->freeAnimation(5); _anim5ActvFl = false; _game._player._stepEnabled = false; - _globals._sequenceIndexes[10] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[10], false, 6, 0, 0, 1); + _globals._sequenceIndexes[10] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[10], false, 6, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[10], 4); _scene->_sequences.setRange(_globals._sequenceIndexes[10], -1, -2); _scene->_sequences.setTrigger(_globals._sequenceIndexes[10], 0, 0, 1); diff --git a/engines/mads/sequence.cpp b/engines/mads/sequence.cpp index 184d710976..61848c0bbc 100644 --- a/engines/mads/sequence.cpp +++ b/engines/mads/sequence.cpp @@ -564,11 +564,6 @@ void SequenceList::setRange(int sequence_id, int first, int last) { warning("TODO: SequenceList::setRange"); } -int SequenceList::addBackwardSequence(int idx, bool flipped, int numTicks, int intervalTicks, int startTicks, int expire) { - warning("TODO: SequenceList::addBackwardSequence"); - return -1; -} - int SequenceList::setTrigger(int idx, int trigger_type, int trigger_sprite, int trigger_code) { warning("TODO: SequenceList::setTrigger"); return -1; diff --git a/engines/mads/sequence.h b/engines/mads/sequence.h index a1ce3b89af..900458ebba 100644 --- a/engines/mads/sequence.h +++ b/engines/mads/sequence.h @@ -129,7 +129,6 @@ public: int addStampCycle(int srcSpriteIdx, bool flipped, int sprite); int setTimingTrigger(int delay, int code); void setRange(int sequence_id, int first, int last); - int addBackwardSequence(int idx, bool flipped, int numTicks, int intervalTicks, int startTicks, int expire); int setTrigger(int sequence_id, int trigger_type, int trigger_sprite, int trigger_code); void setSeqPlayer(int idx, bool flag); }; -- cgit v1.2.3