diff options
Diffstat (limited to 'engines/lastexpress/fight')
-rw-r--r-- | engines/lastexpress/fight/fight.cpp | 6 | ||||
-rw-r--r-- | engines/lastexpress/fight/fighter_anna.cpp | 4 | ||||
-rw-r--r-- | engines/lastexpress/fight/fighter_ivo.cpp | 4 | ||||
-rw-r--r-- | engines/lastexpress/fight/fighter_milos.cpp | 4 | ||||
-rw-r--r-- | engines/lastexpress/fight/fighter_salko.cpp | 4 | ||||
-rw-r--r-- | engines/lastexpress/fight/fighter_vesna.cpp | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/engines/lastexpress/fight/fight.cpp b/engines/lastexpress/fight/fight.cpp index 47694dda3e..7f7a06fdc6 100644 --- a/engines/lastexpress/fight/fight.cpp +++ b/engines/lastexpress/fight/fight.cpp @@ -90,7 +90,7 @@ void Fight::eventMouse(const Common::Event &ev) { // Handle right button click if (ev.type == Common::EVENT_RBUTTONUP) { - getSoundQueue()->removeFromQueue(kEntityTables0); + getSoundQueue()->stop(kEntityTables0); setStopped(); getGlobalTimer() ? _state = 0 : ++_state; @@ -137,7 +137,7 @@ void Fight::eventMouse(const Common::Event &ev) { // Stop fight if clicked if (ev.type == Common::EVENT_LBUTTONUP) { _handleTimer = false; - getSoundQueue()->removeFromQueue(kEntityTables0); + getSoundQueue()->stop(kEntityTables0); bailout(kFightEndExit); } @@ -145,7 +145,7 @@ void Fight::eventMouse(const Common::Event &ev) { if (ev.type == Common::EVENT_RBUTTONUP) { if (getGlobalTimer()) { if (getSoundQueue()->isBuffered("TIMER")) - getSoundQueue()->removeFromQueue("TIMER"); + getSoundQueue()->stop("TIMER"); setGlobalTimer(900); } diff --git a/engines/lastexpress/fight/fighter_anna.cpp b/engines/lastexpress/fight/fighter_anna.cpp index 4fdb71a6e4..9e211e0faa 100644 --- a/engines/lastexpress/fight/fighter_anna.cpp +++ b/engines/lastexpress/fight/fighter_anna.cpp @@ -108,7 +108,7 @@ void FighterPlayerAnna::handleAction(FightAction action) { } if (_field_34 > 4) { - getSoundQueue()->removeFromQueue(kEntityTables0); + getSoundQueue()->stop(kEntityTables0); _fight->bailout(Fight::kFightEndWin); } } @@ -176,7 +176,7 @@ void FighterOpponentAnna::update() { _opponent->handleAction((FightAction)_sequenceIndex); if (_opponent->getCountdown() <= 0) { - getSoundQueue()->removeFromQueue(kEntityTables0); + getSoundQueue()->stop(kEntityTables0); handleAction(kFightActionLost); } } diff --git a/engines/lastexpress/fight/fighter_ivo.cpp b/engines/lastexpress/fight/fighter_ivo.cpp index d5289ab0b7..8e64ce8651 100644 --- a/engines/lastexpress/fight/fighter_ivo.cpp +++ b/engines/lastexpress/fight/fighter_ivo.cpp @@ -111,7 +111,7 @@ void FighterPlayerIvo::update() { if (_opponent->getCountdown() <= 0) { setSequenceAndDraw(9, kFightSequenceType1); _opponent->setSequenceAndDraw(8, kFightSequenceType1); - getSoundQueue()->removeFromQueue(kEntityTables0); + getSoundQueue()->stop(kEntityTables0); handleAction(kFightActionWin); return; @@ -228,7 +228,7 @@ void FighterOpponentIvo::update() { if (_opponent->getCountdown() <= 0) { setSequenceAndDraw(7, kFightSequenceType1); _opponent->setSequenceAndDraw(8, kFightSequenceType1); - getSoundQueue()->removeFromQueue(kEntityTables0); + getSoundQueue()->stop(kEntityTables0); _opponent->handleAction(kFightActionWin); diff --git a/engines/lastexpress/fight/fighter_milos.cpp b/engines/lastexpress/fight/fighter_milos.cpp index 5493d26ca5..2063bf771a 100644 --- a/engines/lastexpress/fight/fighter_milos.cpp +++ b/engines/lastexpress/fight/fighter_milos.cpp @@ -108,7 +108,7 @@ void FighterPlayerMilos::update() { setSequenceAndDraw(5, kFightSequenceType1); _opponent->setSequenceAndDraw(6, kFightSequenceType1); - getSoundQueue()->removeFromQueue(kEntityTables0); + getSoundQueue()->stop(kEntityTables0); getSound()->playSound(kEntityTrain, "MUS029", kVolumeFull); handleAction(kFightActionWin); @@ -211,7 +211,7 @@ void FighterOpponentMilos::update() { _opponent->handleAction((FightAction)_sequenceIndex); if (_opponent->getCountdown() <= 0) { - getSoundQueue()->removeFromQueue(kEntityTables0); + getSoundQueue()->stop(kEntityTables0); handleAction(kFightActionLost); } } diff --git a/engines/lastexpress/fight/fighter_salko.cpp b/engines/lastexpress/fight/fighter_salko.cpp index a11bf292d5..07c72aeadd 100644 --- a/engines/lastexpress/fight/fighter_salko.cpp +++ b/engines/lastexpress/fight/fighter_salko.cpp @@ -96,7 +96,7 @@ void FighterPlayerSalko::update() { if (_frame && checkFrame(2)) { if (_opponent->getCountdown() <= 0) { - getSoundQueue()->removeFromQueue(kEntityTables0); + getSoundQueue()->stop(kEntityTables0); _fight->bailout(Fight::kFightEndWin); return; @@ -185,7 +185,7 @@ void FighterOpponentSalko::update() { if (_frame && checkFrame(2)) { if (_opponent->getCountdown() <= 0) { - getSoundQueue()->removeFromQueue(kEntityTables0); + getSoundQueue()->stop(kEntityTables0); _fight->bailout(Fight::kFightEndLost); // Stop processing diff --git a/engines/lastexpress/fight/fighter_vesna.cpp b/engines/lastexpress/fight/fighter_vesna.cpp index eba30faf25..36734de82f 100644 --- a/engines/lastexpress/fight/fighter_vesna.cpp +++ b/engines/lastexpress/fight/fighter_vesna.cpp @@ -104,7 +104,7 @@ void FighterPlayerVesna::update() { _opponent->handleAction(kFightAction3); if (_opponent->getCountdown() <= 0) { - getSoundQueue()->removeFromQueue(kEntityTables0); + getSoundQueue()->stop(kEntityTables0); _fight->bailout(Fight::kFightEndWin); return; } @@ -252,7 +252,7 @@ void FighterOpponentVesna::update() { _opponent->update(); Fighter::update(); - getSoundQueue()->removeFromQueue(kEntityTables0); + getSoundQueue()->stop(kEntityTables0); // Stop processing return; |