diff --git a/src/modes/follow_the_leader.cpp b/src/modes/follow_the_leader.cpp index f2665eabe..0fd89173c 100644 --- a/src/modes/follow_the_leader.cpp +++ b/src/modes/follow_the_leader.cpp @@ -20,6 +20,7 @@ #include "gui/menu_manager.hpp" #include "user_config.hpp" #include "translation.hpp" +#include "audio/sound_manager.hpp" //----------------------------------------------------------------------------- FollowTheLeaderRace::FollowTheLeaderRace() : LinearWorld() @@ -70,6 +71,11 @@ void FollowTheLeaderRace::countdownReachedZero() { removeKart(kart_number); } + + // almost over, use fast music + if(getCurrentNumKarts()==3) + sound_manager->switchToFastMusic(); + // The follow the leader race is over if there is only one kart left, // or if all players have gone if(getCurrentNumKarts()==2 || getCurrentNumPlayers()==0) diff --git a/src/modes/linear_world.cpp b/src/modes/linear_world.cpp index b61e0b24c..cde3b4d05 100644 --- a/src/modes/linear_world.cpp +++ b/src/modes/linear_world.cpp @@ -290,13 +290,6 @@ void LinearWorld::doLapCounting ( KartInfo& kart_info, Kart* kart ) // Prevent cheating by setting time to a negative number, indicating // that the line wasn't crossed properly. kart_info.m_lap_start_time = -1.0f; - } else - { // Switch to fast music in case of follow the leader when only 3 karts are left - if(race_manager->getMinorMode()==RaceManager::MINOR_MODE_FOLLOW_LEADER && - RaceManager::getWorld()->getCurrentNumKarts()==3) - { - sound_manager->switchToFastMusic(); - } } } // doLapCounting //-----------------------------------------------------------------------------