From: <de...@us...> - 2013-11-10 09:53:39
|
Revision: 14405 http://sourceforge.net/p/supertuxkart/code/14405 Author: deveee Date: 2013-11-10 09:53:36 +0000 (Sun, 10 Nov 2013) Log Message: ----------- Fixed #1089. Stop goal sound when the game is terminated or restarted. Modified Paths: -------------- main/trunk/src/modes/soccer_world.cpp main/trunk/src/modes/soccer_world.hpp Modified: main/trunk/src/modes/soccer_world.cpp =================================================================== --- main/trunk/src/modes/soccer_world.cpp 2013-11-10 00:55:57 UTC (rev 14404) +++ main/trunk/src/modes/soccer_world.cpp 2013-11-10 09:53:36 UTC (rev 14405) @@ -44,8 +44,16 @@ WorldStatus::setClockMode(CLOCK_CHRONO); m_use_highscores = false; } // SoccerWorld +//----------------------------------------------------------------------------- +/** The destructor frees al data structures. + */ +SoccerWorld::~SoccerWorld() +{ + sfx_manager->deleteSFX(m_goal_sound); +} // ~SoccerWorld //----------------------------------------------------------------------------- + /** Initializes the soccer world. It sets up the data structure * to keep track of points etc. for each kart. */ @@ -95,6 +103,12 @@ obj->reset(); obj->getPhysics()->reset(); } + + if (m_goal_sound != NULL && + m_goal_sound->getStatus() == SFXManager::SFX_PLAYING) + { + m_goal_sound->stop(); + } initKartList(); } // reset Modified: main/trunk/src/modes/soccer_world.hpp =================================================================== --- main/trunk/src/modes/soccer_world.hpp 2013-11-10 00:55:57 UTC (rev 14404) +++ main/trunk/src/modes/soccer_world.hpp 2013-11-10 09:53:36 UTC (rev 14405) @@ -59,7 +59,7 @@ public: SoccerWorld(); - virtual ~SoccerWorld() {} + virtual ~SoccerWorld(); virtual void init(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |