diff options
author | Andrei Karas <akaras@inbox.ru> | 2011-04-28 02:48:51 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2011-04-28 02:48:51 +0300 |
commit | b375f3d5161164cedbdf98347d4f67b7f7ac3c43 (patch) | |
tree | 1a3df98d1d92da26bbaa79a1bcf905b3836fee6a /src | |
parent | 4cd8cf7f527553abad86c07c8ebbb2ba8b5d3699 (diff) | |
download | manaplus-b375f3d5161164cedbdf98347d4f67b7f7ac3c43.tar.gz manaplus-b375f3d5161164cedbdf98347d4f67b7f7ac3c43.tar.bz2 manaplus-b375f3d5161164cedbdf98347d4f67b7f7ac3c43.tar.xz manaplus-b375f3d5161164cedbdf98347d4f67b7f7ac3c43.zip |
Add fade out music also to local music.
Diffstat (limited to 'src')
-rw-r--r-- | src/localplayer.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 860b1cbe4..af0fab18b 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -3283,7 +3283,12 @@ void LocalPlayer::updateCoords() if (str.empty()) str = mMap->getMusicFile(); if (str != sound.getCurrentMusicFile()) - sound.playMusic(str); + { + if (str.empty()) + sound.fadeOutMusic(); + else + sound.fadeOutAndPlayMusic(str); + } } } |