summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-01-15 11:16:04 +0300
committerAndrei Karas <akaras@inbox.ru>2013-01-15 11:16:04 +0300
commit36a45d61e46b785a7f24597ff8ebbd3fe83b8c73 (patch)
treee0e1b83e60343455a007e3c84124f0edd25a52e6 /src
parent84909c2a5f074f17e716116c56df0cad74393c55 (diff)
downloadplus-36a45d61e46b785a7f24597ff8ebbd3fe83b8c73.tar.gz
plus-36a45d61e46b785a7f24597ff8ebbd3fe83b8c73.tar.bz2
plus-36a45d61e46b785a7f24597ff8ebbd3fe83b8c73.tar.xz
plus-36a45d61e46b785a7f24597ff8ebbd3fe83b8c73.zip
Enable music fadeout by default.
Diffstat (limited to 'src')
-rw-r--r--src/defaults.cpp2
-rw-r--r--src/gui/setup_audio.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 6b10c4f26..43df5951b 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -296,7 +296,7 @@ DefaultsData* getConfigDefaults()
AddDEF("highlightWords", "");
AddDEF("selfMouseHeal", true);
AddDEF("serverslistupdate", "");
- AddDEF("fadeoutmusic", false);
+ AddDEF("fadeoutmusic", true);
AddDEF("screenActionKeyboard", Input::KEY_SHOW_KEYBOARD);
AddDEF("screenActionButton0", Input::KEY_STOP_SIT);
AddDEF("screenActionButton1", Input::KEY_TARGET_ATTACK);
diff --git a/src/gui/setup_audio.cpp b/src/gui/setup_audio.cpp
index faea24c1e..cc5c815d4 100644
--- a/src/gui/setup_audio.cpp
+++ b/src/gui/setup_audio.cpp
@@ -82,7 +82,7 @@ Setup_Audio::Setup_Audio(const Widget2 *const widget) :
new SetupItemSlider(_("Music volume"), "", "musicVolume",
this, "musicVolumeEvent", 0, sound.getMaxVolume(), 150, true);
- new SetupItemCheckBox(_("Enable music fade out (can be very slow)"), "",
+ new SetupItemCheckBox(_("Enable music fade out"), "",
"fadeoutmusic", this, "fadeoutmusicEvent");