diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-07-02 19:55:05 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-07-02 19:55:05 +0300 |
commit | f1f04f512d284d12bf2c59e212800d7c24de323e (patch) | |
tree | 3bd062864af609ddd5410f47f528e6b3868cdeb8 /src/being/localplayer.cpp | |
parent | eda234f5e156d376541044b351fd2e1e766700a3 (diff) | |
download | manaplus-f1f04f512d284d12bf2c59e212800d7c24de323e.tar.gz manaplus-f1f04f512d284d12bf2c59e212800d7c24de323e.tar.bz2 manaplus-f1f04f512d284d12bf2c59e212800d7c24de323e.tar.xz manaplus-f1f04f512d284d12bf2c59e212800d7c24de323e.zip |
Fix background musis if it was enabled by quck enable action.
Diffstat (limited to 'src/being/localplayer.cpp')
-rw-r--r-- | src/being/localplayer.cpp | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index 28b08a558..52bf2d75d 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -3126,6 +3126,23 @@ void LocalPlayer::navigateClean() tmpLayer->clean(); } +void LocalPlayer::updateMusic() +{ + if (mMap) + { + std::string str = mMap->getObjectData(mX, mY, MapItemType::MUSIC); + if (str.empty()) + str = mMap->getMusicFile(); + if (str != soundManager.getCurrentMusicFile()) + { + if (str.empty()) + soundManager.fadeOutMusic(); + else + soundManager.fadeOutAndPlayMusic(str); + } + } +} + void LocalPlayer::updateCoords() { Being::updateCoords(); @@ -3141,20 +3158,7 @@ void LocalPlayer::updateCoords() socialWindow->updatePortals(); if (viewport) viewport->hideBeingPopup(); - if (mMap) - { - std::string str = mMap->getObjectData(mX, mY, - MapItemType::MUSIC); - if (str.empty()) - str = mMap->getMusicFile(); - if (str != soundManager.getCurrentMusicFile()) - { - if (str.empty()) - soundManager.fadeOutMusic(); - else - soundManager.fadeOutAndPlayMusic(str); - } - } + updateMusic(); } if (mShowNavigePath) |