Implemented a simple non-blocking fadeOutAndPlay system.

It's currently used when changing maps.

Resolves: TMW-Mantis: #750.

Reviewed-by: Thorbjorn.

Conflicts:

	src/game.cpp
	src/sound.cpp
	src/sound.h

1 files changed, 6 insertions, 1 deletions

diff --git a/src/game.cpp b/src/game.cpp
index d5ac15ef3..3c3067bbf 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1430,7 +1430,12 @@ void Game::changeMap(const std::string &mapPath)
     std::string oldMusic = mCurrentMap ? mCurrentMap->getMusicFile() : "";
     std::string newMusic = newMap ? newMap->getMusicFile() : "";
     if (newMusic != oldMusic)
-        sound.playMusic(newMusic);
+    {
+        if (newMusic.empty())
+            sound.fadeOutMusic();
+        else
+            sound.fadeOutAndPlayMusic(newMusic);
+    }
 
     if (mCurrentMap)
         mCurrentMap->saveExtraLayer();