Move tool stuff to tool.{h,cpp}

[oweals/minetest.git] / src / defaultsettings.cpp

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index e25bc90e985507bd29582554cf341acbcba38345..fbc22867d1505783c6858c29cdadc1eba7fd03af 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -36,6 +36,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("keymap_jump", "KEY_SPACE");
        settings->setDefault("keymap_sneak", "KEY_LSHIFT");
        settings->setDefault("keymap_inventory", "KEY_KEY_I");
+       settings->setDefault("keymap_special1", "KEY_KEY_E");
        settings->setDefault("keymap_chat", "KEY_KEY_T");
        settings->setDefault("keymap_cmd", "/");
        settings->setDefault("keymap_rangeselect", "KEY_KEY_R");
@@ -43,8 +44,10 @@ void set_default_settings(Settings *settings)
        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_force_fog_off", "KEY_F3");
+       settings->setDefault("keymap_toggle_update_camera", "KEY_F4");
        // Some (temporary) keys for debugging
-       settings->setDefault("keymap_special1", "KEY_KEY_E");
        settings->setDefault("keymap_print_debug_stacks", "KEY_KEY_P");
 
        settings->setDefault("wanted_fps", "30");
@@ -60,7 +63,7 @@ void set_default_settings(Settings *settings)
        settings->setDefault("fov", "72");
        settings->setDefault("view_bobbing", "true");
        settings->setDefault("new_style_water", "false");
-       settings->setDefault("new_style_leaves", "true");
+       settings->setDefault("new_style_leaves", "false");
        settings->setDefault("smooth_lighting", "true");
        settings->setDefault("frametime_graph", "false");
        settings->setDefault("enable_texture_atlas", "true");
@@ -74,33 +77,39 @@ void set_default_settings(Settings *settings)
        settings->setDefault("enable_clouds", "true");
        settings->setDefault("invisible_stone", "false");
        settings->setDefault("screenshot_path", ".");
+       settings->setDefault("view_bobbing_amount", "1.0");
+       settings->setDefault("enable_3d_clouds", "false");
+       settings->setDefault("opaque_water", "false");
 
        // Server stuff
+       // "map-dir" doesn't exist by default.
        settings->setDefault("motd", "");
        settings->setDefault("max_users", "20");
-       settings->setDefault("enable_experimental", "false");
+       settings->setDefault("strict_protocol_version_checking", "true");
        settings->setDefault("creative_mode", "false");
        settings->setDefault("enable_damage", "true");
+       settings->setDefault("only_peaceful_mobs", "false");
+       settings->setDefault("fixed_map_seed", "");
        settings->setDefault("give_initial_stuff", "false");
        settings->setDefault("default_password", "");
        settings->setDefault("default_privs", "build, shout");
+
        settings->setDefault("profiler_print_interval", "0");
        settings->setDefault("enable_mapgen_debug_info", "false");
-       settings->setDefault("fixed_map_seed", "");
-
        settings->setDefault("objectdata_interval", "0.2");
-       settings->setDefault("active_object_range", "2");
+       settings->setDefault("active_object_send_range_blocks", "3");
+       settings->setDefault("active_block_range", "2");
        //settings->setDefault("max_simultaneous_block_sends_per_client", "1");
        // This causes frametime jitter on client side, or does it?
        settings->setDefault("max_simultaneous_block_sends_per_client", "2");
        settings->setDefault("max_simultaneous_block_sends_server_total", "8");
-       settings->setDefault("max_block_send_distance", "8");
-       settings->setDefault("max_block_generate_distance", "8");
+       settings->setDefault("max_block_send_distance", "7");
+       settings->setDefault("max_block_generate_distance", "5");
        settings->setDefault("time_send_interval", "20");
        settings->setDefault("time_speed", "96");
        settings->setDefault("server_unload_unused_data_timeout", "60");
-       settings->setDefault("server_map_save_interval", "60");
+       settings->setDefault("server_map_save_interval", "10");
        settings->setDefault("full_block_send_enable_min_time_from_building", "2.0");
-       //settings->setDefault("dungeon_rarity", "0.025");
+       settings->setDefault("enable_experimental", "false");
 }