summaryrefslogtreecommitdiff
path: root/src/defaultsettings.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2012-02-02 14:35:18 +0200
committerPerttu Ahola <celeron55@gmail.com>2012-02-02 14:35:18 +0200
commit365f7a5bfe0cf1838b0c6f3936c4437f3dd9f1f7 (patch)
tree89d2c75eb94b975f36933820a6f492b822e1c4f0 /src/defaultsettings.cpp
parent796009ef2152262ba9b2541256a880ff555449fd (diff)
parentb85b4ede822b9d2d5f82c034e520341e9d86b08a (diff)
downloadminetest-365f7a5bfe0cf1838b0c6f3936c4437f3dd9f1f7.tar.gz
minetest-365f7a5bfe0cf1838b0c6f3936c4437f3dd9f1f7.tar.bz2
minetest-365f7a5bfe0cf1838b0c6f3936c4437f3dd9f1f7.zip
Merge remote-tracking branch 'kahrl/hidehud'
Diffstat (limited to 'src/defaultsettings.cpp')
-rw-r--r--src/defaultsettings.cpp16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 4de854dd8..2b6cb7f53 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -43,14 +43,25 @@ void set_default_settings(Settings *settings)
settings->setDefault("keymap_rangeselect", "KEY_KEY_R");
settings->setDefault("keymap_freemove", "KEY_KEY_K");
settings->setDefault("keymap_fastmove", "KEY_KEY_J");
- settings->setDefault("keymap_frametime_graph", "KEY_F1");
settings->setDefault("keymap_screenshot", "KEY_F12");
- settings->setDefault("keymap_toggle_profiler", "KEY_F2");
+ settings->setDefault("keymap_toggle_hud", "KEY_F1");
+ settings->setDefault("keymap_toggle_chat", "KEY_F2");
settings->setDefault("keymap_toggle_force_fog_off", "KEY_F3");
settings->setDefault("keymap_toggle_update_camera", "KEY_F4");
+ settings->setDefault("keymap_toggle_debug", "KEY_F5");
+ settings->setDefault("keymap_toggle_profiler", "KEY_F6");
+ settings->setDefault("keymap_increase_viewing_range_min", "KEY_PRIOR");
+ settings->setDefault("keymap_decrease_viewing_range_min", "KEY_NEXT");
// Some (temporary) keys for debugging
settings->setDefault("keymap_print_debug_stacks", "KEY_KEY_P");
+ // Show debug info by default?
+ #ifdef NDEBUG
+ settings->setDefault("show_debug", "false");
+ #else
+ settings->setDefault("show_debug", "true");
+ #endif
+
settings->setDefault("wanted_fps", "30");
settings->setDefault("fps_max", "60");
settings->setDefault("viewing_range_nodes_max", "300");
@@ -66,7 +77,6 @@ void set_default_settings(Settings *settings)
settings->setDefault("new_style_water", "false");
settings->setDefault("new_style_leaves", "false");
settings->setDefault("smooth_lighting", "true");
- settings->setDefault("frametime_graph", "false");
settings->setDefault("enable_texture_atlas", "true");
settings->setDefault("texture_path", "");
settings->setDefault("video_driver", "opengl");