diff options
| author | sapier <sapier at gmx dot net> | 2012-02-04 12:41:25 +0100 |
|---|---|---|
| committer | sapier <sapier at gmx dot net> | 2012-02-04 12:41:25 +0100 |
| commit | 77df09540c4d7eadef760779e123af88a48aafaa (patch) | |
| tree | febf1009328d30c31a14a1a1ca1600e99b4c3e6b /src/defaultsettings.cpp | |
| parent | 3454e6779337d8523ae76c7fa16eb8c565aa2381 (diff) | |
| parent | a1eb2836c0764829ebad1462432bb3c5f32750df (diff) | |
| download | minetest-77df09540c4d7eadef760779e123af88a48aafaa.tar.xz | |
Merge remote branch 'upstream/master' into sapier_experimental
Conflicts:
src/scriptapi.cpp
Diffstat (limited to 'src/defaultsettings.cpp')
| -rw-r--r-- | src/defaultsettings.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 1e48183fa..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"); @@ -84,7 +94,7 @@ void set_default_settings(Settings *settings) // Server stuff // "map-dir" doesn't exist by default. settings->setDefault("motd", ""); - settings->setDefault("max_users", "20"); + settings->setDefault("max_users", "100"); settings->setDefault("strict_protocol_version_checking", "true"); settings->setDefault("creative_mode", "false"); settings->setDefault("enable_damage", "true"); |