diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-04-11 21:56:38 +0200 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-04-11 21:56:38 +0200 |
| commit | 5957475d12c7739fbe69e569316a33588c621c51 (patch) | |
| tree | 542fb61c4034d477ee8bfe111efca3589471cef1 /src/game.cpp | |
| parent | d30a53bf394079f2286fcf1faa8932d0becc2980 (diff) | |
| download | mana-5957475d12c7739fbe69e569316a33588c621c51.tar.gz mana-5957475d12c7739fbe69e569316a33588c621c51.tar.bz2 mana-5957475d12c7739fbe69e569316a33588c621c51.tar.xz mana-5957475d12c7739fbe69e569316a33588c621c51.zip | |
Implemented a simple non-blocking fadeOutAndPlay system.
It's currently used when changing maps.
Resolves: TMW-Mantis: #750.
Reviewed-by: Thorbjorn.
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp index 7f1def50..d2d2ecfd 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -982,9 +982,9 @@ void Game::changeMap(const std::string &mapPath) if (newMusic != oldMusic) { if (newMusic.empty()) - sound.stopMusic(); + sound.fadeOutMusic(); else - sound.playMusic(newMusic); + sound.fadeOutAndPlayMusic(newMusic); } delete mCurrentMap; |