Remove settings not used any longer

diff --git a/minetest.conf.example b/minetest.conf.example
index f722286c7e3bcff2e3f1d747a7aafea1328a859c..44bd34107e17aa0e7f8f035755060707493b7190 100644 (file)
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -341,11 +341,6 @@
 #dedicated_server_step = 0.1
 # Can be set to true to disable shutting down on invalid world data
 #ignore_world_load_errors = false
-# Congestion control parameters
-# time in seconds, rate in ~500B packets
-#congestion_control_aim_rtt = 0.2
-#congestion_control_max_rate = 400
-#congestion_control_min_rate = 10
 # Specifies URL from which client fetches media instead of using UDP
 # $filename should be accessible from $remote_media$filename via cURL
 # (obviously, remote_media should end with a slash)

diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index 6ba7057bdfc55413d1c4c60481fecafe24be416a..a2d0a4c4106c1042a1a532958a3421bfe2bb5827 100644 (file)
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -228,9 +228,6 @@ void set_default_settings(Settings *settings)
        settings->setDefault("full_block_send_enable_min_time_from_building", "2.0");
        settings->setDefault("dedicated_server_step", "0.1");
        settings->setDefault("ignore_world_load_errors", "false");
-       settings->setDefault("congestion_control_aim_rtt", "0.2");
-       settings->setDefault("congestion_control_max_rate", "400");
-       settings->setDefault("congestion_control_min_rate", "10");
        settings->setDefault("remote_media", "");
        settings->setDefault("debug_log_level", "2");
        settings->setDefault("emergequeue_limit_total", "256");