From dab73fa8cf807f560b0d5c3cd0615ce32fc80107 Mon Sep 17 00:00:00 2001 From: auria Date: Thu, 11 Oct 2012 21:47:50 +0000 Subject: [PATCH] Make overworld play its music git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11672 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/modes/overworld.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/modes/overworld.cpp b/src/modes/overworld.cpp index 7dadbcd35..72e9f75d2 100644 --- a/src/modes/overworld.cpp +++ b/src/modes/overworld.cpp @@ -15,6 +15,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +#include "audio/music_manager.hpp" #include "challenges/unlock_manager.hpp" #include "graphics/irr_driver.hpp" #include "input/device_manager.hpp" @@ -112,12 +113,15 @@ void OverWorld::update(float dt) // Skip annoying waiting without a purpose // Make sure to do all things that would normally happen in the // update() method of the base classes. - if (getPhase()< GO_PHASE) + if (getPhase() < GO_PHASE) { setPhase(RACE_PHASE); // Normally done in WorldStatus::update(), during phase SET_PHASE, // so we have to start music 'manually', since we skip all phases. World::getWorld()->getTrack()->startMusic(); + + if (music_manager->getCurrentMusic() != NULL) + music_manager->getCurrentMusic()->startMusic(); } LinearWorld::update(dt);