diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-12-14 02:21:30 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-12-14 02:21:30 +0300 |
| commit | 78afa659472cc4cfca37056088ed9cb9f79845eb (patch) | |
| tree | 82396c65956514c58fdd696dc71e7400bb6d1379 /src/being | |
| parent | ee1fc0b63cb7f27df85c43474497b805df6e31f5 (diff) | |
| download | manaverse-78afa659472cc4cfca37056088ed9cb9f79845eb.tar.gz manaverse-78afa659472cc4cfca37056088ed9cb9f79845eb.tar.bz2 manaverse-78afa659472cc4cfca37056088ed9cb9f79845eb.tar.xz manaverse-78afa659472cc4cfca37056088ed9cb9f79845eb.zip | |
Remove default parameters from soundmanager.
Diffstat (limited to 'src/being')
| -rw-r--r-- | src/being/being.cpp | 5 | ||||
| -rw-r--r-- | src/being/localplayer.cpp | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index 618989bd5..daf8cd542 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -1946,8 +1946,9 @@ void Being::logic() restrict2 const int time2 = tick_time; if (time2 > mNextSound.time) { - soundManager.playSfx(sound->sound, mNextSound.x, mNextSound.y); - + soundManager.playSfx(sound->sound, + mNextSound.x, + mNextSound.y); mNextSound.sound = nullptr; mNextSound.time = time2 + sound->delay; } diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index 3eb2a32af..53ab03d16 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -2126,9 +2126,9 @@ void LocalPlayer::updateMusic() const if (str != soundManager.getCurrentMusicFile()) { if (str.empty()) - soundManager.fadeOutMusic(); + soundManager.fadeOutMusic(1000); else - soundManager.fadeOutAndPlayMusic(str); + soundManager.fadeOutAndPlayMusic(str, 1000); } } } |