diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-11-09 17:59:14 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-11-09 17:59:14 +0300 |
| commit | db1e60556c72b1b87ff2a384c556ccca724c46d6 (patch) | |
| tree | 22a5f4e9c4f436ef8e746e0a2d688de80c1597a6 /src/defaults.cpp | |
| parent | c2bb49be52a92deccec7428b6859242688fc8987 (diff) | |
| parent | 1716861f0ee2f7a3714c5b44bb0f017c3d8d3b2c (diff) | |
| download | plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.gz plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.bz2 plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.tar.xz plus-db1e60556c72b1b87ff2a384c556ccca724c46d6.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/defaults.cpp')
| -rw-r--r-- | src/defaults.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/defaults.cpp b/src/defaults.cpp index 0b71b1db7..d4b2a5379 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -21,7 +21,6 @@ #include "defaults.h" -#include "client.h" #include "graphicsmanager.h" #include "being/being.h" @@ -30,6 +29,12 @@ #include "render/graphics.h" +#include "net/netconsts.h" + +#ifndef USE_SDL2 +#include <SDL_keyboard.h> +#endif + #include "debug.h" VariableData* createData(const int defData) @@ -129,7 +134,11 @@ DefaultsData* getConfigDefaults() AddDEF("fpslimit", 60); AddDEF("theme", ""); AddDEF("showChatColorsList", true); +#ifdef __native_client__ + AddDEF("customcursor", false); +#else AddDEF("customcursor", true); +#endif AddDEF("showDidYouKnow", true); #endif AddDEF("showEmotesButton", true); @@ -182,7 +191,6 @@ DefaultsData* getConfigDefaults() AddDEF("npcFont", "fonts/dejavusans.ttf"); AddDEF("showBackground", true); AddDEF("enableTradeTab", true); - AddDEF("logToChat", false); AddDEF("cyclePlayers", true); AddDEF("cycleMonsters", true); AddDEF("cycleNPC", true); @@ -492,6 +500,7 @@ DefaultsData* getFeaturesDefaults() { DefaultsData *const configData = new DefaultsData; AddDEF("languageTab", false); + AddDEF("allowFollow", true); return configData; } |