diff options
| author | Socapex <philippe_groarke@yahoo.ca> | 2013-01-19 21:02:01 -0500 |
|---|---|---|
| committer | Socapex <philippe_groarke@yahoo.ca> | 2013-01-19 21:02:01 -0500 |
| commit | df606ace309acaf0c78f52e1f98eabed6c844ae2 (patch) | |
| tree | d9799b0e4a507d9eacbbafc1755eecea03f0b373 /src/defaults.cpp | |
| parent | d0169223b889a115b486e974e5b287c3ccb00d85 (diff) | |
| parent | 678d4e70999ade5a36862039875aa5564291d09d (diff) | |
| download | plus-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.gz plus-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.bz2 plus-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.xz plus-df606ace309acaf0c78f52e1f98eabed6c844ae2.zip | |
Merge remote-tracking branch 'upstream/master' into osx
Diffstat (limited to 'src/defaults.cpp')
| -rw-r--r-- | src/defaults.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/defaults.cpp b/src/defaults.cpp index 6b10c4f26..fd895fbf7 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -1,7 +1,7 @@ /* * The ManaPlus Client * Copyright (C) 2010 The Mana Developers - * Copyright (C) 2011-2012 The ManaPlus Developers + * Copyright (C) 2011-2013 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -262,7 +262,7 @@ DefaultsData* getConfigDefaults() AddDEF("autohideChat", false); AddDEF("downloadProxy", ""); AddDEF("downloadProxyType", 0); - AddDEF("blur", true); + AddDEF("blur", false); #if defined(WIN32) || defined(__APPLE__) AddDEF("centerwindow", true); #endif @@ -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); |