diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/constants.h | 2 | ||||
| -rw-r--r-- | src/defaultsettings.cpp | 2 | ||||
| -rw-r--r-- | src/utility.h | 6 |
4 files changed, 11 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 26f4872da..58596a101 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -173,6 +173,8 @@ else() set(WARNING_FLAGS "") endif() + set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-unused-but-set-variable") + set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${WARNING_FLAGS} -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops") set(CMAKE_CXX_FLAGS_DEBUG "-g -O1 -Wall") diff --git a/src/constants.h b/src/constants.h index cdd61470c..14ca58b43 100644 --- a/src/constants.h +++ b/src/constants.h @@ -53,6 +53,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #define FOV_ANGLE (PI/2.5) // The absolute working limit is (2^15 - viewing_range). +// I really don't want to make every algorithm to check if it's +// going near the limit or not, so this is lower. #define MAP_GENERATION_LIMIT (31000) // Size of node in rendering units diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index eb3b3c92e..f11b0b2d7 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -36,7 +36,7 @@ void set_default_settings() g_settings.setDefault("keymap_left", "KEY_KEY_A"); g_settings.setDefault("keymap_right", "KEY_KEY_D"); g_settings.setDefault("keymap_jump", "KEY_SPACE"); - g_settings.setDefault("keymap_sneak", "KEY_RSHIFT"); + g_settings.setDefault("keymap_sneak", "KEY_LSHIFT"); g_settings.setDefault("keymap_inventory", "KEY_KEY_I"); g_settings.setDefault("keymap_chat", "KEY_KEY_T"); g_settings.setDefault("keymap_rangeselect", "KEY_KEY_R"); diff --git a/src/utility.h b/src/utility.h index 326ebf161..84838c0c7 100644 --- a/src/utility.h +++ b/src/utility.h @@ -800,6 +800,10 @@ inline s32 stoi(const std::string &s, s32 min, s32 max) return i; } + +// MSVC2010 includes it's own versions of these +#if !defined(_MSC_VER) || _MSC_VER < 1600 + inline s32 stoi(std::string s) { return atoi(s.c_str()); @@ -818,6 +822,8 @@ inline float stof(std::string s) return f; } +#endif + inline std::string itos(s32 i) { std::ostringstream o; |