X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fdefaultsettings.cpp;h=1e48183fa028a537e6cc7a62faf539b799b616e5;hb=ceaf8edaded4c9e8f2e6fa285d9765e7095df332;hp=7f0d46a10b6c8cc5d1aa5ae29d1c3a314e92da79;hpb=3a06fb88314cff3dd0c96665229b47af0f01b276;p=dragonfireclient.git

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 7f0d46a10..1e48183fa 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -35,6 +35,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("keymap_right", "KEY_KEY_D");
 	settings->setDefault("keymap_jump", "KEY_SPACE");
 	settings->setDefault("keymap_sneak", "KEY_LSHIFT");
+	settings->setDefault("keymap_drop", "KEY_KEY_Q");
 	settings->setDefault("keymap_inventory", "KEY_KEY_I");
 	settings->setDefault("keymap_special1", "KEY_KEY_E");
 	settings->setDefault("keymap_chat", "KEY_KEY_T");
@@ -46,6 +47,7 @@ void set_default_settings(Settings *settings)
 	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_print_debug_stacks", "KEY_KEY_P");
 
@@ -62,7 +64,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,10 +76,10 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("invert_mouse", "false");
 	settings->setDefault("enable_farmesh", "false");
 	settings->setDefault("enable_clouds", "true");
-	settings->setDefault("invisible_stone", "false");
 	settings->setDefault("screenshot_path", ".");
 	settings->setDefault("view_bobbing_amount", "1.0");
-	settings->setDefault("enable_2d_clouds", "false");
+	settings->setDefault("enable_3d_clouds", "false");
+	settings->setDefault("opaque_water", "false");
 
 	// Server stuff
 	// "map-dir" doesn't exist by default.
@@ -91,10 +93,11 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("give_initial_stuff", "false");
 	settings->setDefault("default_password", "");
 	settings->setDefault("default_privs", "build, shout");
+	settings->setDefault("unlimited_player_transfer_distance", "true");
+	settings->setDefault("enable_pvp", "true");
 
 	settings->setDefault("profiler_print_interval", "0");
 	settings->setDefault("enable_mapgen_debug_info", "false");
-	settings->setDefault("objectdata_interval", "0.2");
 	settings->setDefault("active_object_send_range_blocks", "3");
 	settings->setDefault("active_block_range", "2");
 	//settings->setDefault("max_simultaneous_block_sends_per_client", "1");
@@ -105,8 +108,8 @@ void set_default_settings(Settings *settings)
 	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", "10");
+	settings->setDefault("server_unload_unused_data_timeout", "29");
+	settings->setDefault("server_map_save_interval", "5.3");
 	settings->setDefault("full_block_send_enable_min_time_from_building", "2.0");
 	settings->setDefault("enable_experimental", "false");
 }