diff options
author | Strangerke | 2015-11-10 09:15:55 +0100 |
---|---|---|
committer | Strangerke | 2015-11-10 09:15:55 +0100 |
commit | 7fb2ec93662823fdfe14221d308e3a53d5cb4f6a (patch) | |
tree | 809040986c87200c45661b10bce04b606b7fb84e /engines/mads/phantom | |
parent | a71fd5760861a11eb74495b967d697ec32ec88f6 (diff) | |
download | scummvm-rg350-7fb2ec93662823fdfe14221d308e3a53d5cb4f6a.tar.gz scummvm-rg350-7fb2ec93662823fdfe14221d308e3a53d5cb4f6a.tar.bz2 scummvm-rg350-7fb2ec93662823fdfe14221d308e3a53d5cb4f6a.zip |
MADS: Replace the use of setTimingTrigger by a call to addTimer for V2+ games
Diffstat (limited to 'engines/mads/phantom')
-rw-r--r-- | engines/mads/phantom/game_phantom.cpp | 4 | ||||
-rw-r--r-- | engines/mads/phantom/phantom_scenes1.cpp | 78 | ||||
-rw-r--r-- | engines/mads/phantom/phantom_scenes2.cpp | 58 | ||||
-rw-r--r-- | engines/mads/phantom/phantom_scenes3.cpp | 20 | ||||
-rw-r--r-- | engines/mads/phantom/phantom_scenes4.cpp | 20 | ||||
-rw-r--r-- | engines/mads/phantom/phantom_scenes5.cpp | 76 |
6 files changed, 128 insertions, 128 deletions
diff --git a/engines/mads/phantom/game_phantom.cpp b/engines/mads/phantom/game_phantom.cpp index 9ed8d24c9b..7e61241182 100644 --- a/engines/mads/phantom/game_phantom.cpp +++ b/engines/mads/phantom/game_phantom.cpp @@ -486,7 +486,7 @@ void GamePhantom::doObjectAction() { else { switch (_trigger) { case 0: - _scene._sequences.setTimingTrigger(4, 1); + _scene._sequences.addTimer(4, 1); _globals[kLanternStatus] = 1; _vm->_dialogs->spinObject(OBJ_LANTERN); break; @@ -511,7 +511,7 @@ void GamePhantom::doObjectAction() { else { switch (_trigger) { case 0: - _scene._sequences.setTimingTrigger(4, 1); + _scene._sequences.addTimer(4, 1); _globals[kLanternStatus] = 0; _vm->_dialogs->spinObject(OBJ_LANTERN); break; diff --git a/engines/mads/phantom/phantom_scenes1.cpp b/engines/mads/phantom/phantom_scenes1.cpp index 3bfb82172d..d1d77e3f43 100644 --- a/engines/mads/phantom/phantom_scenes1.cpp +++ b/engines/mads/phantom/phantom_scenes1.cpp @@ -672,7 +672,7 @@ void Scene102::enter() { _scene->_sequences.setDepth(_globals._sequenceIndexes[3], deathDepth); _scene->_sequences.setPosition(_globals._sequenceIndexes[3], deathPos); _scene->_sequences.setScale(_globals._sequenceIndexes[3], deathScale); - _scene->_sequences.setTimingTrigger(120, 65); + _scene->_sequences.addTimer(120, 65); _globals._sequenceIndexes[2] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[2], false, 4); _scene->_sequences.setDepth(_globals._sequenceIndexes[2], 14); } else if (_scene->_priorSceneId == 103 || _scene->_priorSceneId != RETURNING_FROM_LOADING) { @@ -718,7 +718,7 @@ void Scene102::actions() { _action.isAction(VERB_PUSH, NOUN_ORCHESTRA_DOOR) || _action.isAction(VERB_OPEN, NOUN_ORCHESTRA_DOOR)) { if (_anim0Running) { - _scene->_sequences.setTimingTrigger(15, 70); + _scene->_sequences.addTimer(15, 70); _game._player._stepEnabled = false; } else { switch (_game._trigger) { @@ -1074,7 +1074,7 @@ void Scene103::enter() { _scene->_sequences.setDepth(_globals._sequenceIndexes[10], 4); _standPosition = 1; _game._player._playerPos = Common::Point(79, 132); - _scene->_sequences.setTimingTrigger(1, 100); + _scene->_sequences.addTimer(1, 100); } else { _standPosition = 2; _globals._animationIndexes[3] = _scene->loadAnimation(formAnimName('w', 1), 0); @@ -1608,7 +1608,7 @@ void Scene103::actions() { _game._player._visible = true; _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[2]); _game._player.walk(Common::Point(295, 132), FACING_WEST); - _scene->_sequences.setTimingTrigger(180, 3); + _scene->_sequences.addTimer(180, 3); break; case 3: @@ -1652,7 +1652,7 @@ void Scene103::actions() { _globals._sequenceIndexes[2] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[2], false, 4); _game.syncTimers(1, _globals._sequenceIndexes[2], 1, oldIdx); _scene->_sequences.setSeqPlayer(_globals._sequenceIndexes[2], false); - _scene->_sequences.setTimingTrigger(15, 2); + _scene->_sequences.addTimer(15, 2); _vm->_sound->command(73); } break; @@ -1708,7 +1708,7 @@ void Scene103::actions() { case 2: _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[8]); _game._player._visible = true; - _scene->_sequences.setTimingTrigger(20, 3); + _scene->_sequences.addTimer(20, 3); _action._inProgress = false; return; @@ -2554,7 +2554,7 @@ void Scene104::enter() { _game._visitedScenes.add(101); _scene->setCamera(Common::Point(60, 0)); - _scene->_sequences.setTimingTrigger(1, 91); + _scene->_sequences.addTimer(1, 91); } else if (_scene->_priorSceneId == 103) { if (_globals[kRoom103104Transition] == 0) { @@ -2742,7 +2742,7 @@ void Scene104::actions() { case 1: _globals._sequenceIndexes[3] = _scene->_sequences.startPingPongCycle(_globals._spriteIndexes[3], false, 1, 10); - _scene->_sequences.setTimingTrigger(60, 2); + _scene->_sequences.addTimer(60, 2); _scene->_sequences.setAnimRange(_globals._sequenceIndexes[3], 4, 4); _scene->_sequences.setDepth(_globals._sequenceIndexes[3], 15); _scene->_sequences.setSeqPlayer(_globals._sequenceIndexes[3], true); @@ -3638,7 +3638,7 @@ void Scene105::enter() { _globals[kPanelIn206] && _globals[kDoneRichConv203] && _game._objects.isInInventory(OBJ_LANTERN) && ((_game._objects.isInInventory(OBJ_CABLE_HOOK) && _game._objects.isInInventory(OBJ_ROPE)) || _game._objects.isInInventory(OBJ_ROPE_WITH_HOOK))) { _globals[kHintThatDaaeIsHome2] = true; - _scene->_sequences.setTimingTrigger(300, 75); + _scene->_sequences.addTimer(300, 75); } } @@ -3728,7 +3728,7 @@ void Scene105::step() { case 75: _scene->playSpeech(8); - _scene->_sequences.setTimingTrigger(120, 76); + _scene->_sequences.addTimer(120, 76); break; case 76: @@ -3846,7 +3846,7 @@ void Scene105::actions() { case 2: _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[5]); _game._player._visible = true; - _scene->_sequences.setTimingTrigger(20, 3); + _scene->_sequences.addTimer(20, 3); break; case 3: @@ -3885,7 +3885,7 @@ void Scene105::actions() { case 2: _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[6]); _game._player._visible = true; - _scene->_sequences.setTimingTrigger(20, 3); + _scene->_sequences.addTimer(20, 3); break; case 3: @@ -3916,7 +3916,7 @@ void Scene105::actions() { case 2: _game._player._visible = true; - _scene->_sequences.setTimingTrigger(180, 3); + _scene->_sequences.addTimer(180, 3); break; case 3: @@ -3962,7 +3962,7 @@ void Scene105::actions() { _game.syncTimers(1, _globals._sequenceIndexes[6], 1, tmpIdx); _scene->_sequences.setSeqPlayer(_globals._sequenceIndexes[6], false); _vm->_sound->command(73); - _scene->_sequences.setTimingTrigger(15, 2); + _scene->_sequences.addTimer(15, 2); } break; @@ -4216,7 +4216,7 @@ void Scene106::enter() { && ((_game._objects.isInInventory(OBJ_CABLE_HOOK) && _game._objects.isInInventory(OBJ_ROPE)) || _game._objects.isInInventory(OBJ_ROPE_WITH_HOOK))) { _globals[kHintThatDaaeIsHome1] = true; - _scene->_sequences.setTimingTrigger(300, 85); + _scene->_sequences.addTimer(300, 85); } } @@ -4294,7 +4294,7 @@ void Scene106::step() { switch (_game._trigger) { case 85: _scene->playSpeech(8); - _scene->_sequences.setTimingTrigger(120, 86); + _scene->_sequences.addTimer(120, 86); break; case 86: @@ -4348,7 +4348,7 @@ void Scene106::actions() { case 2: _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[5]); _game._player._visible = true; - _scene->_sequences.setTimingTrigger(20, 3); + _scene->_sequences.addTimer(20, 3); break; case 3: @@ -4388,7 +4388,7 @@ void Scene106::actions() { case 2: _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[5]); _game._player._visible = true; - _scene->_sequences.setTimingTrigger(20, 3); + _scene->_sequences.addTimer(20, 3); break; case 3: @@ -4428,7 +4428,7 @@ void Scene106::actions() { return; case 81: - _scene->_sequences.setTimingTrigger(120, 82); + _scene->_sequences.addTimer(120, 82); _action._inProgress = false; return; @@ -4478,7 +4478,7 @@ void Scene106::actions() { _globals._sequenceIndexes[0] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[0], false, 4, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[0], 2); _scene->_sequences.setAnimRange(_globals._sequenceIndexes[0], 1, 9); - _scene->_sequences.setTimingTrigger(6, 2); + _scene->_sequences.addTimer(6, 2); _scene->_sequences.addSubEntry(_globals._sequenceIndexes[0], SEQUENCE_TRIGGER_EXPIRE, 0, 1); break; @@ -4846,7 +4846,7 @@ void Scene107::actions() { case 2: _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[1]); _game._player._visible = true; - _scene->_sequences.setTimingTrigger(20, 3); + _scene->_sequences.addTimer(20, 3); break; case 3: @@ -5642,7 +5642,7 @@ void Scene109::enter() { _scene->_sequences.setDepth(_globals._sequenceIndexes[3], 14); _globals._sequenceIndexes[4] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[4], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[4], 14); - _scene->_sequences.setTimingTrigger(1, 70); + _scene->_sequences.addTimer(1, 70); } else { _globals._spriteIndexes[5] = _scene->_sprites.addSprites(formAnimName('z', 0), false); _globals._spriteIndexes[6] = _scene->_sprites.addSprites(formAnimName('z', 1), false); @@ -5775,7 +5775,7 @@ void Scene109::step() { _globals._sequenceIndexes[4] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[4], false, rndFrame); _scene->_sequences.setDepth(_globals._sequenceIndexes[4], 14); - _scene->_sequences.setTimingTrigger(rndDelay, 70); + _scene->_sequences.addTimer(rndDelay, 70); } } @@ -5960,7 +5960,7 @@ void Scene109::actions() { else if (_currentFloor == 2) _game._player.walk(Common::Point(2, 281), FACING_WEST); - _scene->_sequences.setTimingTrigger(180, 3); + _scene->_sequences.addTimer(180, 3); break; case 3: @@ -6184,7 +6184,7 @@ void Scene110::actions() { _globals._sequenceIndexes[1] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[1], false, 4); _game.syncTimers(1, _globals._sequenceIndexes[1], 1, idx); _scene->_sequences.setSeqPlayer(_globals._sequenceIndexes[1], false); - _scene->_sequences.setTimingTrigger(30, 2); + _scene->_sequences.addTimer(30, 2); _vm->_sound->command(73); } break; @@ -6234,7 +6234,7 @@ void Scene110::actions() { _globals._sequenceIndexes[1] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[1], false, 4); _game.syncTimers(1, _globals._sequenceIndexes[1], 1, idx); _scene->_sequences.setSeqPlayer(_globals._sequenceIndexes[1], false); - _scene->_sequences.setTimingTrigger(30, 2); + _scene->_sequences.addTimer(30, 2); _vm->_sound->command(73); } break; @@ -6625,7 +6625,7 @@ void Scene111::step() { _game._player._visible = true; _anim0ActvFl = false; _game.syncTimers(2, 0, 3, _globals._animationIndexes[0]); - _scene->_sequences.setTimingTrigger(30, 71); + _scene->_sequences.addTimer(30, 71); break; case 71: @@ -6661,7 +6661,7 @@ void Scene111::actions() { _globals._sequenceIndexes[0] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[0], false, 4); _game.syncTimers(1, _globals._sequenceIndexes[0], 1, idx); _scene->_sequences.setSeqPlayer(_globals._sequenceIndexes[0], false); - _scene->_sequences.setTimingTrigger(30, 2); + _scene->_sequences.addTimer(30, 2); _vm->_sound->command(73); _action._inProgress = false; return; @@ -6711,7 +6711,7 @@ void Scene111::actions() { _globals._sequenceIndexes[0] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[0], false, 4); _game.syncTimers(1, _globals._sequenceIndexes[0], 1, idx); _scene->_sequences.setSeqPlayer(_globals._sequenceIndexes[0], false); - _scene->_sequences.setTimingTrigger(30, 2); + _scene->_sequences.addTimer(30, 2); _vm->_sound->command(73); _action._inProgress = false; return; @@ -7342,7 +7342,7 @@ void Scene112::handleConversation() { break; case 68: - _scene->_sequences.setTimingTrigger(120, 70); + _scene->_sequences.addTimer(120, 70); _vm->_gameConv->hold(); break; @@ -7962,7 +7962,7 @@ void Scene113::enter() { _scene->_hotspots.activate(NOUN_CHRISTINE, true); _scene->_hotspots.activateAtPos(NOUN_CHRISTINE, false, Common::Point(220, 130)); - _scene->_sequences.setTimingTrigger(60, 60); + _scene->_sequences.addTimer(60, 60); _game._player._playerPos = Common::Point(190, 148); _game._player._facing = FACING_NORTH; } else if ((_globals[kCurrentYear] == 1881) && _globals[kChrisKickedRaoulOut]) { @@ -7972,7 +7972,7 @@ void Scene113::enter() { _globals[kCameFromFade] = true; _game._player._stepEnabled = false; _globals[kPlayerScore] += 8; - _scene->_sequences.setTimingTrigger(60, 110); + _scene->_sequences.addTimer(60, 110); } else if (_scene->_priorSceneId == 111) { _game._player._playerPos = Common::Point(190, 148); _game._player._facing = FACING_NORTH; @@ -8894,7 +8894,7 @@ void Scene113::handleFlorentConversation() { case 26: if (!_prevent2) { - _scene->_sequences.setTimingTrigger(120, 92); + _scene->_sequences.addTimer(120, 92); _vm->_gameConv->setInterlocutorTrigger(96); _florentStatus = 0; _prevent2 = true; @@ -8953,7 +8953,7 @@ void Scene113::handleFlorentConversation() { case 82: _florentStatus = 0; - _scene->_sequences.setTimingTrigger(120, 84); + _scene->_sequences.addTimer(120, 84); _vm->_gameConv->hold(); break; @@ -9020,7 +9020,7 @@ void Scene113::handleLoveConversation() { case 21: if (!_armsOutFl) { _dayStatus = 4; - _scene->_sequences.setTimingTrigger(1, 70); + _scene->_sequences.addTimer(1, 70); _scene->_userInterface.emptyConversationList(); _scene->_userInterface.setup(kInputConversation); _scene->_hotspots.activate(NOUN_CHRISTINE, false); @@ -9092,12 +9092,12 @@ void Scene113::handleLoveConversation() { if (_afterKissFl) _vm->_gameConv->release(); else - _scene->_sequences.setTimingTrigger(1, 72); + _scene->_sequences.addTimer(1, 72); break; case 76: _vm->_gameConv->hold(); - _scene->_sequences.setTimingTrigger(1, 72); + _scene->_sequences.addTimer(1, 72); break; case 78: @@ -9116,7 +9116,7 @@ void Scene113::handleLoveConversation() { break; case 82: - _scene->_sequences.setTimingTrigger(120, 84); + _scene->_sequences.addTimer(120, 84); _vm->_gameConv->hold(); _dayStatus = 1; _dayWantsToTalk = true; @@ -9249,7 +9249,7 @@ void Scene114::actions() { case 2: _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[1]); _game._player._visible = true; - _scene->_sequences.setTimingTrigger(20, 3); + _scene->_sequences.addTimer(20, 3); break; case 3: diff --git a/engines/mads/phantom/phantom_scenes2.cpp b/engines/mads/phantom/phantom_scenes2.cpp index 0ae990a48c..5d0c3facd9 100644 --- a/engines/mads/phantom/phantom_scenes2.cpp +++ b/engines/mads/phantom/phantom_scenes2.cpp @@ -2080,7 +2080,7 @@ void Scene203::handleBrieConversation() { else _scene->playSpeech(1); - _scene->_sequences.setTimingTrigger(60, 110); + _scene->_sequences.addTimer(60, 110); } break; @@ -3185,7 +3185,7 @@ void Scene203::handleDaaeAnimation() { break; case 201: - _scene->_sequences.setTimingTrigger(1, 95); + _scene->_sequences.addTimer(1, 95); break; case 76: @@ -3567,7 +3567,7 @@ void Scene204::actions() { case 2: _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[4]); _game._player._visible = true; - _scene->_sequences.setTimingTrigger(20, 3); + _scene->_sequences.addTimer(20, 3); break; case 3: @@ -4187,7 +4187,7 @@ void Scene204::handleEndAnimation() { } if ((_scene->_animation[_globals._animationIndexes[3]]->getCurrentFrame() == 26) && !_skip2Fl) { - _scene->_sequences.setTimingTrigger(300, 85); + _scene->_sequences.addTimer(300, 85); _scene->_kernelMessages.add(Common::Point(123, 137), 0x1110, 0, 0, 360, _game.getQuote(0x75)); _skip2Fl = true; } @@ -4601,7 +4601,7 @@ void Scene205::actions() { _game.syncTimers(1, _globals._sequenceIndexes[2], 1, idx); _scene->_sequences.setSeqPlayer(_globals._sequenceIndexes[2], false); _vm->_sound->command(72); - _scene->_sequences.setTimingTrigger(15, 2); + _scene->_sequences.addTimer(15, 2); _action._inProgress = false; return; } @@ -5953,7 +5953,7 @@ void Scene206::step() { if (_scene->_animation[_globals._animationIndexes[0]]->getCurrentFrame() == 118) { _globals[kKnockedOverHead] = true; _skip1Fl = true; - _scene->_sequences.setTimingTrigger(1, 84); + _scene->_sequences.addTimer(1, 84); } } @@ -6031,7 +6031,7 @@ void Scene206::actions() { case 78: _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[5]); _game._player._visible = true; - _scene->_sequences.setTimingTrigger(20, 79); + _scene->_sequences.addTimer(20, 79); _action._inProgress = false; return; @@ -6144,7 +6144,7 @@ void Scene206::actions() { _globals._sequenceIndexes[5] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[5], true, -2); _game.syncTimers(1, _globals._sequenceIndexes[5], 1, idx); _scene->_sequences.setSeqPlayer(_globals._sequenceIndexes[5], false); - _scene->_sequences.setTimingTrigger(30, 65); + _scene->_sequences.addTimer(30, 65); } break; @@ -6307,7 +6307,7 @@ void Scene206::actions() { _globals[kPlayerScoreFlags] |= 8; _globals[kPlayerScore] += 5; } - _scene->_sequences.setTimingTrigger(15, 96); + _scene->_sequences.addTimer(15, 96); _action._inProgress = false; return; @@ -6405,8 +6405,8 @@ void Scene207::actions() { case 1: _globals._sequenceIndexes[0] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[0], false, -2); _scene->_sequences.setDepth(_globals._sequenceIndexes[0], 10); - _scene->_sequences.setTimingTrigger(120, 2); - _scene->_sequences.setTimingTrigger(240, 3); + _scene->_sequences.addTimer(120, 2); + _scene->_sequences.addTimer(240, 3); break; case 2: @@ -6589,43 +6589,43 @@ void Scene208::enter() { _topLeftPeopleFrame = 2; _globals._sequenceIndexes[0] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[0], false, _topLeftPeopleFrame); _scene->_sequences.setDepth(_globals._sequenceIndexes[0], 1); - _scene->_sequences.setTimingTrigger(120, 60); + _scene->_sequences.addTimer(120, 60); _topRightPeopleFrame = 2; _globals._sequenceIndexes[1] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[1], false, _topRightPeopleFrame); _scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1); - _scene->_sequences.setTimingTrigger(30, 62); + _scene->_sequences.addTimer(30, 62); _middleLeftPeopleFrame = 2; _globals._sequenceIndexes[2] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[2], false, _middleLeftPeopleFrame); _scene->_sequences.setDepth(_globals._sequenceIndexes[2], 1); - _scene->_sequences.setTimingTrigger(30, 64); + _scene->_sequences.addTimer(30, 64); _centerPeopleFrame = 1; _direction = 1; _globals._sequenceIndexes[3] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[3], false, _centerPeopleFrame); _scene->_sequences.setDepth(_globals._sequenceIndexes[3], 14); - _scene->_sequences.setTimingTrigger(300, 66); + _scene->_sequences.addTimer(300, 66); _middleRightPeopleFrame = 3; _globals._sequenceIndexes[4] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[4], false, _middleRightPeopleFrame); _scene->_sequences.setDepth(_globals._sequenceIndexes[4], 1); - _scene->_sequences.setTimingTrigger(60, 68); + _scene->_sequences.addTimer(60, 68); _bottomLeftPeopleFrame = 4; _globals._sequenceIndexes[5] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[5], false, _bottomLeftPeopleFrame); _scene->_sequences.setDepth(_globals._sequenceIndexes[5], 1); - _scene->_sequences.setTimingTrigger(60, 70); + _scene->_sequences.addTimer(60, 70); _bottomMiddlePeopleFrame = 4; _globals._sequenceIndexes[6] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[6], false, _bottomMiddlePeopleFrame); _scene->_sequences.setDepth(_globals._sequenceIndexes[6], 14); - _scene->_sequences.setTimingTrigger(30, 72); + _scene->_sequences.addTimer(30, 72); _bottomRightPeopleFrame = 3; _globals._sequenceIndexes[7] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[7], false, _bottomRightPeopleFrame); _scene->_sequences.setDepth(_globals._sequenceIndexes[7], 1); - _scene->_sequences.setTimingTrigger(15, 74); + _scene->_sequences.addTimer(15, 74); _globals._animationIndexes[0] = _scene->loadAnimation(formAnimName('p', 1), 80); @@ -6699,7 +6699,7 @@ void Scene208::animateTopLeftPeople() { _globals._sequenceIndexes[0] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[0], false, _topLeftPeopleFrame); _scene->_sequences.setDepth(_globals._sequenceIndexes[0], 1); int delay = _vm->getRandomNumber(15, 60); - _scene->_sequences.setTimingTrigger(delay, 60); + _scene->_sequences.addTimer(delay, 60); } void Scene208::animateTopRightPeople() { @@ -6726,7 +6726,7 @@ void Scene208::animateTopRightPeople() { _globals._sequenceIndexes[1] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[1], false, _topRightPeopleFrame); _scene->_sequences.setDepth(_globals._sequenceIndexes[1], 1); int delay = _vm->getRandomNumber(15, 60); - _scene->_sequences.setTimingTrigger(delay, 62); + _scene->_sequences.addTimer(delay, 62); } void Scene208::animateMiddleLeftPeople() { @@ -6758,7 +6758,7 @@ void Scene208::animateMiddleLeftPeople() { _globals._sequenceIndexes[2] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[2], false, _middleLeftPeopleFrame); _scene->_sequences.setDepth(_globals._sequenceIndexes[2], 1); - _scene->_sequences.setTimingTrigger(delay, 64); + _scene->_sequences.addTimer(delay, 64); } @@ -6790,7 +6790,7 @@ void Scene208::animateCenterPeople() { _globals._sequenceIndexes[3] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[3], false, _centerPeopleFrame); _scene->_sequences.setDepth(_globals._sequenceIndexes[3], 14); - _scene->_sequences.setTimingTrigger(delay, 66); + _scene->_sequences.addTimer(delay, 66); } void Scene208::animateMiddleRightPeople() { @@ -6820,7 +6820,7 @@ void Scene208::animateMiddleRightPeople() { _globals._sequenceIndexes[4] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[4], false, _middleRightPeopleFrame); _scene->_sequences.setDepth(_globals._sequenceIndexes[4], 1); int delay = _vm->getRandomNumber(15, 60); - _scene->_sequences.setTimingTrigger(delay, 68); + _scene->_sequences.addTimer(delay, 68); } void Scene208::animateBottomLeftPeople() { @@ -6847,7 +6847,7 @@ void Scene208::animateBottomLeftPeople() { _globals._sequenceIndexes[5] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[5], false, _bottomLeftPeopleFrame); _scene->_sequences.setDepth(_globals._sequenceIndexes[5], 1); int delay = _vm->getRandomNumber(15, 60); - _scene->_sequences.setTimingTrigger(delay, 70); + _scene->_sequences.addTimer(delay, 70); } void Scene208::animateBottomMiddlePeople() { @@ -6874,7 +6874,7 @@ void Scene208::animateBottomMiddlePeople() { _globals._sequenceIndexes[6] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[6], false, _bottomMiddlePeopleFrame); _scene->_sequences.setDepth(_globals._sequenceIndexes[6], 14); int delay = _vm->getRandomNumber(15, 60); - _scene->_sequences.setTimingTrigger(delay, 72); + _scene->_sequences.addTimer(delay, 72); } void Scene208::animateBottomRightPeople() { @@ -6901,7 +6901,7 @@ void Scene208::animateBottomRightPeople() { _globals._sequenceIndexes[7] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[7], false, _bottomRightPeopleFrame); _scene->_sequences.setDepth(_globals._sequenceIndexes[7], 1); int delay = _vm->getRandomNumber(15, 60); - _scene->_sequences.setTimingTrigger(delay, 74); + _scene->_sequences.addTimer(delay, 74); } /*------------------------------------------------------------------------*/ @@ -6930,7 +6930,7 @@ void Scene250::enter() { void Scene250::step() { if (_game._trigger == 1) - _scene->_sequences.setTimingTrigger(12, 2); + _scene->_sequences.addTimer(12, 2); if (_game._trigger == 2) { int y = 68; @@ -6982,7 +6982,7 @@ void Scene250::step() { messageId = 0x41; _scene->_kernelMessages.add(Common::Point(160, y), 0x1110, 0x20, 0, 900, _game.getQuote(messageId)); - _scene->_sequences.setTimingTrigger(930, 3); + _scene->_sequences.addTimer(930, 3); } if (_game._trigger == 3) diff --git a/engines/mads/phantom/phantom_scenes3.cpp b/engines/mads/phantom/phantom_scenes3.cpp index 4ce543f071..33a30a88bb 100644 --- a/engines/mads/phantom/phantom_scenes3.cpp +++ b/engines/mads/phantom/phantom_scenes3.cpp @@ -217,7 +217,7 @@ void Scene301::step() { _scene->setAnimFrame(_globals._animationIndexes[0], 60); if (!_skip2Fl) { _vm->_sound->command(1); - _scene->_sequences.setTimingTrigger(420, 70); + _scene->_sequences.addTimer(420, 70); _skip2Fl = true; } } @@ -231,7 +231,7 @@ void Scene301::step() { } if (_game._trigger == 64) - _scene->_sequences.setTimingTrigger(60, 65); + _scene->_sequences.addTimer(60, 65); if (_game._trigger == 65) _vm->_dialogs->show(30137); @@ -529,7 +529,7 @@ void Scene302::actions() { case 2: _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[1]); _game._player._visible = true; - _scene->_sequences.setTimingTrigger(20, 3); + _scene->_sequences.addTimer(20, 3); break; case 3: @@ -766,7 +766,7 @@ void Scene303::actions() { _anim0ActvFl = false; _game._player._visible = true; _game.syncTimers(2, 0, 3, _globals._animationIndexes[0]); - _scene->_sequences.setTimingTrigger(20, 2); + _scene->_sequences.addTimer(20, 2); break; case 2: @@ -1558,9 +1558,9 @@ void Scene306::enter() { void Scene306::step() { if (_game._trigger == 60) { if (_vm->_sound->_preferRoland) - _scene->_sequences.setTimingTrigger(120, 61); + _scene->_sequences.addTimer(120, 61); else - _scene->_sequences.setTimingTrigger(300, 61); + _scene->_sequences.addTimer(300, 61); } if (!_speechDoneFl && (_scene->_animation[_globals._animationIndexes[0]]->getCurrentFrame() == 3)) { @@ -1571,7 +1571,7 @@ void Scene306::step() { if (_game._trigger == 61) { _vm->_sound->command(1); _vm->_sound->command(66); - _scene->_sequences.setTimingTrigger(120, 62); + _scene->_sequences.addTimer(120, 62); } if (_game._trigger == 62) @@ -1689,7 +1689,7 @@ void Scene307::actions() { case 2: _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[1]); _game._player._visible = true; - _scene->_sequences.setTimingTrigger(20, 3); + _scene->_sequences.addTimer(20, 3); break; case 3: @@ -1733,7 +1733,7 @@ void Scene307::actions() { _globals._sequenceIndexes[3] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[3], false, -2); _game.syncTimers(1, _globals._sequenceIndexes[3], 1, idx); _scene->_sequences.setDepth(_globals._sequenceIndexes[3], 14); - _scene->_sequences.setTimingTrigger(10, 73); + _scene->_sequences.addTimer(10, 73); } break; @@ -1979,7 +1979,7 @@ void Scene308::enter() { if (!_game._visitedScenes._sceneRevisited) { _globals[kPlayerScore] += 5; - _scene->_sequences.setTimingTrigger(1, 60); + _scene->_sequences.addTimer(1, 60); } sceneEntrySound(); diff --git a/engines/mads/phantom/phantom_scenes4.cpp b/engines/mads/phantom/phantom_scenes4.cpp index 997eae37b6..3e7c1e78bc 100644 --- a/engines/mads/phantom/phantom_scenes4.cpp +++ b/engines/mads/phantom/phantom_scenes4.cpp @@ -722,7 +722,7 @@ void Scene403::enter() { } if ((_game._difficulty == DIFFICULTY_EASY) && (_globals[kCatacombsRoom] == 19)) - _scene->_sequences.setTimingTrigger(120, 60); + _scene->_sequences.addTimer(120, 60); sceneEntrySound(); } @@ -1227,7 +1227,7 @@ void Scene404::enter() { } if (_globals[kPriestPistonPuke]) - _scene->_sequences.setTimingTrigger(120, 60); + _scene->_sequences.addTimer(120, 60); sceneEntrySound(); } @@ -1887,7 +1887,7 @@ void Scene406::actions() { case 2: _globals._sequenceIndexes[0] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[0], true, -2); _scene->_sequences.setSeqPlayer(_globals._sequenceIndexes[0], true); - _scene->_sequences.setTimingTrigger(30, 3); + _scene->_sequences.addTimer(30, 3); break; case 3: @@ -1901,7 +1901,7 @@ void Scene406::actions() { case 4: _game._player._visible = true; _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[0]); - _scene->_sequences.setTimingTrigger(6, 5); + _scene->_sequences.addTimer(6, 5); break; case 5: @@ -2575,7 +2575,7 @@ void Scene408::enter() { } if ((_game._difficulty == DIFFICULTY_HARD) && (_globals[kCatacombsRoom] == 52)) - _scene->_sequences.setTimingTrigger(120, 60); + _scene->_sequences.addTimer(120, 60); sceneEntrySound(); } @@ -3057,7 +3057,7 @@ void Scene409::step() { if (_game._trigger == 61) { _globals._sequenceIndexes[7] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[7], false, -2); _scene->_sequences.setDepth(_globals._sequenceIndexes[7], 1); - _scene->_sequences.setTimingTrigger(60, 62); + _scene->_sequences.addTimer(60, 62); _vm->_sound->command(27); } @@ -3091,7 +3091,7 @@ void Scene409::actions() { _globals._sequenceIndexes[8] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[8], false, 4); _game.syncTimers(1, _globals._sequenceIndexes[8], 1, syncIdx); _scene->_sequences.setSeqPlayer(_globals._sequenceIndexes[8], false); - _scene->_sequences.setTimingTrigger(30, 2); + _scene->_sequences.addTimer(30, 2); _action._inProgress = false; } return; @@ -3297,7 +3297,7 @@ void Scene409::actions() { case 2: _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[0]); _game._player._visible = true; - _scene->_sequences.setTimingTrigger(20, 3); + _scene->_sequences.addTimer(20, 3); break; case 3: @@ -3419,7 +3419,7 @@ void Scene409::actions() { case 2: _globals._sequenceIndexes[0] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[0], false, -2); _scene->_sequences.setSeqPlayer(_globals._sequenceIndexes[0], true); - _scene->_sequences.setTimingTrigger(30, 3); + _scene->_sequences.addTimer(30, 3); break; case 3: @@ -3433,7 +3433,7 @@ void Scene409::actions() { case 4: _game._player._visible = true; _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[0]); - _scene->_sequences.setTimingTrigger(6, 5); + _scene->_sequences.addTimer(6, 5); break; case 5: diff --git a/engines/mads/phantom/phantom_scenes5.cpp b/engines/mads/phantom/phantom_scenes5.cpp index 2468de0526..9a5b8e4178 100644 --- a/engines/mads/phantom/phantom_scenes5.cpp +++ b/engines/mads/phantom/phantom_scenes5.cpp @@ -237,7 +237,7 @@ void Scene501::step() { if ((_scene->_animation[_globals._animationIndexes[0]]->getCurrentFrame() == 28) && !_skipFl) { _skipFl = true; - _scene->_sequences.setTimingTrigger(1, 55); + _scene->_sequences.addTimer(1, 55); } if (_scene->_animation[_globals._animationIndexes[0]]->getCurrentFrame() == 124) { @@ -302,7 +302,7 @@ void Scene501::actions() { _globals._sequenceIndexes[3] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[3], false, 4); _game.syncTimers(1, _globals._sequenceIndexes[3], 1, idx); _scene->_sequences.setSeqPlayer(_globals._sequenceIndexes[3], false); - _scene->_sequences.setTimingTrigger(15, 2); + _scene->_sequences.addTimer(15, 2); _vm->_sound->command(74); } break; @@ -347,7 +347,7 @@ void Scene501::actions() { _globals._sequenceIndexes[3] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[3], false, 4); _game.syncTimers(1, _globals._sequenceIndexes[3], 1, idx); _scene->_sequences.setSeqPlayer(_globals._sequenceIndexes[3], false); - _scene->_sequences.setTimingTrigger(15, 2); + _scene->_sequences.addTimer(15, 2); _vm->_sound->command(74); } break; @@ -472,7 +472,7 @@ void Scene501::actions() { _globals._sequenceIndexes[3] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[3], false, 4); _game.syncTimers(1, _globals._sequenceIndexes[3], 1, idx); _scene->_sequences.setSeqPlayer(_globals._sequenceIndexes[3], false); - _scene->_sequences.setTimingTrigger(15, 2); + _scene->_sequences.addTimer(15, 2); _vm->_sound->command(73); } break; @@ -616,12 +616,12 @@ void Scene501::preActions() { _game._player._stepEnabled = false; _vm->_gameConv->run(26); _vm->_gameConv->exportValue(2); - _scene->_sequences.setTimingTrigger(6, 1); + _scene->_sequences.addTimer(6, 1); break; case 1: if (_vm->_gameConv->_running >= 0) - _scene->_sequences.setTimingTrigger(6, 1); + _scene->_sequences.addTimer(6, 1); else { _game._player._stepEnabled = true; _action._inProgress = true; @@ -862,7 +862,7 @@ void Scene502::step() { _scene->_userInterface.noInventoryAnim(); // CHECKME: Not sure about the next function call _scene->_userInterface.refresh(); - _scene->_sequences.setTimingTrigger(120, 76); + _scene->_sequences.addTimer(120, 76); break; case 73: @@ -942,7 +942,7 @@ void Scene502::actions() { _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[10]); _game._player._visible = true; _game._player._stepEnabled = true; - _scene->_sequences.setTimingTrigger(5, 102); + _scene->_sequences.addTimer(5, 102); _action._inProgress = false; return; @@ -962,7 +962,7 @@ void Scene502::actions() { _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[10]); _game._player._visible = true; _game._player._stepEnabled = true; - _scene->_sequences.setTimingTrigger(5, 102); + _scene->_sequences.addTimer(5, 102); _action._inProgress = false; return; @@ -981,7 +981,7 @@ void Scene502::actions() { case 101: _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[10]); _game._player._visible = true; - _scene->_sequences.setTimingTrigger(5, 102); + _scene->_sequences.addTimer(5, 102); _action._inProgress = false; return; @@ -1006,7 +1006,7 @@ void Scene502::actions() { case 106: _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[10]); _game._player._visible = true; - _scene->_sequences.setTimingTrigger(5, 102); + _scene->_sequences.addTimer(5, 102); _action._inProgress = false; return; @@ -1029,25 +1029,25 @@ void Scene502::actions() { case 1: case 2: case 3: - _scene->_sequences.setTimingTrigger(1, 90); + _scene->_sequences.addTimer(1, 90); break; case 4: case 5: case 6: case 7: - _scene->_sequences.setTimingTrigger(1, 95); + _scene->_sequences.addTimer(1, 95); break; case 8: case 9: case 10: case 11: - _scene->_sequences.setTimingTrigger(1, 100); + _scene->_sequences.addTimer(1, 100); break; default: - _scene->_sequences.setTimingTrigger(1, 105); + _scene->_sequences.addTimer(1, 105); break; } _action._inProgress = false; @@ -1319,28 +1319,28 @@ void Scene502::animateFireBursts() { switch (rndTrigger) { case 1: if (!_fire1ActiveFl) { - _scene->_sequences.setTimingTrigger(_vm->getRandomNumber(300, 600), 60); + _scene->_sequences.addTimer(_vm->getRandomNumber(300, 600), 60); _fire1ActiveFl = true; } break; case 2: if (!_fire2ActiveFl) { - _scene->_sequences.setTimingTrigger(_vm->getRandomNumber(300, 600), 63); + _scene->_sequences.addTimer(_vm->getRandomNumber(300, 600), 63); _fire2ActiveFl = true; } break; case 3: if (!_fire3ActiveFl) { - _scene->_sequences.setTimingTrigger(_vm->getRandomNumber(300, 600), 66); + _scene->_sequences.addTimer(_vm->getRandomNumber(300, 600), 66); _fire3ActiveFl = true; } break; case 4: if (!_fire4ActiveFl) { - _scene->_sequences.setTimingTrigger(_vm->getRandomNumber(300, 600), 69); + _scene->_sequences.addTimer(_vm->getRandomNumber(300, 600), 69); _fire4ActiveFl = true; } break; @@ -1508,7 +1508,7 @@ void Scene502::handlePanelAnimation() { case 3: _globals._sequenceIndexes[11] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[11], false, _puzzleSprites[_panelPushedNum] - 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[11], 14); - _scene->_sequences.setTimingTrigger(5, 111); + _scene->_sequences.addTimer(5, 111); break; case 4: @@ -1517,7 +1517,7 @@ void Scene502::handlePanelAnimation() { case 7: _globals._sequenceIndexes[12] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[12], false, _puzzleSprites[_panelPushedNum] - 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[12], 14); - _scene->_sequences.setTimingTrigger(5, 111); + _scene->_sequences.addTimer(5, 111); break; case 8: @@ -1526,13 +1526,13 @@ void Scene502::handlePanelAnimation() { case 11: _globals._sequenceIndexes[13] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[13], false, _puzzleSprites[_panelPushedNum] - 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[13], 14); - _scene->_sequences.setTimingTrigger(5, 111); + _scene->_sequences.addTimer(5, 111); break; default: _globals._sequenceIndexes[14] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[14], false, _puzzleSprites[_panelPushedNum] - 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[14], 14); - _scene->_sequences.setTimingTrigger(5, 111); + _scene->_sequences.addTimer(5, 111); break; } break; @@ -1615,7 +1615,7 @@ void Scene502::handlePanelAnimation() { _globals._sequenceIndexes[11] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[11], false, newSprId); _scene->_sequences.setDepth(_globals._sequenceIndexes[11], 14); _game.syncTimers(1, _globals._sequenceIndexes[11], 1, idx); - _scene->_sequences.setTimingTrigger(5, 113); + _scene->_sequences.addTimer(5, 113); break; case 4: @@ -1625,7 +1625,7 @@ void Scene502::handlePanelAnimation() { _globals._sequenceIndexes[12] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[12], false, newSprId); _scene->_sequences.setDepth(_globals._sequenceIndexes[12], 14); _game.syncTimers(1, _globals._sequenceIndexes[12], 1, idx); - _scene->_sequences.setTimingTrigger(5, 113); + _scene->_sequences.addTimer(5, 113); break; case 8: @@ -1635,14 +1635,14 @@ void Scene502::handlePanelAnimation() { _globals._sequenceIndexes[13] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[13], false, newSprId); _scene->_sequences.setDepth(_globals._sequenceIndexes[13], 14); _game.syncTimers(1, _globals._sequenceIndexes[13], 1, idx); - _scene->_sequences.setTimingTrigger(5, 113); + _scene->_sequences.addTimer(5, 113); break; default: _globals._sequenceIndexes[14] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[14], false, newSprId); _scene->_sequences.setDepth(_globals._sequenceIndexes[14], 14); _game.syncTimers(1, _globals._sequenceIndexes[14], 1, idx); - _scene->_sequences.setTimingTrigger(5, 113); + _scene->_sequences.addTimer(5, 113); break; } } @@ -2117,7 +2117,7 @@ void Scene504::enter() { _globals._sequenceIndexes[1] = _scene->_sequences.addStampCycle(_globals._spriteIndexes[1], false, 1); _scene->_sequences.setDepth(_globals._sequenceIndexes[1], 14); if (!_globals[kHeListened]) - _scene->_sequences.setTimingTrigger(30, 62); + _scene->_sequences.addTimer(30, 62); } } @@ -2155,12 +2155,12 @@ void Scene504::step() { _game._player._visible = true; _game.syncTimers(2, 0, 3, _globals._animationIndexes[0]); _scene->drawToBackground(_globals._spriteIndexes[0], 1, Common::Point(-32000, -32000), 0, 100); - _scene->_sequences.setTimingTrigger(30, 61); + _scene->_sequences.addTimer(30, 61); } if (_game._trigger == 61) { _game._player._stepEnabled = true; - _scene->_sequences.setTimingTrigger(60, 62); + _scene->_sequences.addTimer(60, 62); } if (_game._trigger == 62) { @@ -2253,7 +2253,7 @@ void Scene504::step() { _game._player._visible = true; _anim1ActvFl = false; _game._player.resetFacing(FACING_EAST); - _scene->_sequences.setTimingTrigger(10, 101); + _scene->_sequences.addTimer(10, 101); } if (_game._trigger == 101) { @@ -2329,7 +2329,7 @@ void Scene504::actions() { _game._player._visible = true; _anim1ActvFl = false; _game._player.resetFacing(FACING_EAST); - _scene->_sequences.setTimingTrigger(10, 101); + _scene->_sequences.addTimer(10, 101); _action._inProgress = false; return; } @@ -2419,7 +2419,7 @@ void Scene504::actions() { case 2: _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[14]); _game._player._visible = true; - _scene->_sequences.setTimingTrigger(20, 3); + _scene->_sequences.addTimer(20, 3); _action._inProgress = false; return; break; @@ -2577,12 +2577,12 @@ void Scene504::preActions() { _game._player._stepEnabled = false; _vm->_gameConv->run(26); _vm->_gameConv->exportValue(2); - _scene->_sequences.setTimingTrigger(6, 1); + _scene->_sequences.addTimer(6, 1); break; case 1: if (_vm->_gameConv->_running >= 0) - _scene->_sequences.setTimingTrigger(6, 1); + _scene->_sequences.addTimer(6, 1); else { _game._player._stepEnabled = true; _action._inProgress = true; @@ -2722,7 +2722,7 @@ void Scene504::handleOrganAnimation() { resetFrame = 25; ++_playCount; if (!_globals[kRightDoorIsOpen504]) { - _scene->_sequences.setTimingTrigger(1, 80); + _scene->_sequences.addTimer(1, 80); _globals[kPlayerScore] += 5; } } @@ -3648,7 +3648,7 @@ void Scene505::handleCoffinDialog() { case 75: _game._player._visible = true; _game.syncTimers(2, 0, 3, _globals._animationIndexes[0]); - _scene->_sequences.setTimingTrigger(10, 76); + _scene->_sequences.addTimer(10, 76); break; case 85: @@ -4117,7 +4117,7 @@ void Scene506::actions() { case 2: _game.syncTimers(2, 0, 1, _globals._sequenceIndexes[4]); _game._player._visible = true; - _scene->_sequences.setTimingTrigger(20, 3); + _scene->_sequences.addTimer(20, 3); break; case 3: |