From b81a702cfa1465802b0bf299473d9c4559190122 Mon Sep 17 00:00:00 2001
From: Charles Dang <exodia339@gmail.com>
Date: Fri, 20 Apr 2018 13:07:36 +1100
Subject: [PATCH] Removed unused Ping Timeout preference

It no longer had any effect. The selective_ping flag is set was ignored by the
server since it now utilizes TCP keepalive.
---
 data/advanced_preferences.cfg           | 11 -----------
 src/game_initialization/multiplayer.cpp | 13 -------------
 src/preferences/game.cpp                |  7 -------
 src/preferences/game.hpp                |  2 --
 4 files changed, 33 deletions(-)

diff --git a/data/advanced_preferences.cfg b/data/advanced_preferences.cfg
index 31454d29e059..6531b6e1c71f 100644
--- a/data/advanced_preferences.cfg
+++ b/data/advanced_preferences.cfg
@@ -56,17 +56,6 @@
     default=yes
 [/advanced_preference]
 
-[advanced_preference]
-    field=ping_timeout
-    name= _ "Ping timeout"
-    description= _ "Number of seconds to wait for a ping reply before timing out. Set to 0 to disable"
-    type=int
-    default=0
-    min=0
-    max=60
-    step=5
-[/advanced_preference]
-
 [advanced_preference]
     field=lobby_auto_open_whisper_windows
     name= _ "Auto-open whisper windows in lobby"
diff --git a/src/game_initialization/multiplayer.cpp b/src/game_initialization/multiplayer.cpp
index 17179c0a7eac..01e780950344 100644
--- a/src/game_initialization/multiplayer.cpp
+++ b/src/game_initialization/multiplayer.cpp
@@ -189,19 +189,6 @@ std::pair<wesnothd_connection_ptr, config> open_connection(std::string host)
 			config& sp = response.add_child("login") ;
 			sp["username"] = login ;
 
-			// Login and enable selective pings -- saves server bandwidth
-			// If ping_timeout has a non-zero value, do not enable
-			// selective pings as this will cause clients to falsely
-			// believe the server has died and disconnect.
-			if(preferences::get_ping_timeout()) {
-				// Pings required so disable selective pings
-				sp["selective_ping"] = false;
-			} else {
-				// Client is bandwidth friendly so allow
-				// server to optimize ping frequency as needed.
-				sp["selective_ping"] = true;
-			}
-
 			sock->send_data(response);
 			sock->wait_and_receive_data(data);
 
diff --git a/src/preferences/game.cpp b/src/preferences/game.cpp
index 022cb81bcab7..54430624767a 100644
--- a/src/preferences/game.cpp
+++ b/src/preferences/game.cpp
@@ -135,8 +135,6 @@ manager::manager() :
 			}
 		}
 	}
-
-	//network::ping_timeout = get_ping_timeout();
 }
 
 manager::~manager()
@@ -403,11 +401,6 @@ void set_network_host(const std::string& host)
 	preferences::set("host", host);
 }
 
-unsigned int get_ping_timeout()
-{
-	return lexical_cast_default<unsigned>(preferences::get("ping_timeout"), 0);
-}
-
 std::string campaign_server()
 {
 	if(!preferences::get("campaign_server").empty()) {
diff --git a/src/preferences/game.hpp b/src/preferences/game.hpp
index 0d442a722144..bbac870ddcb0 100644
--- a/src/preferences/game.hpp
+++ b/src/preferences/game.hpp
@@ -78,8 +78,6 @@ class acquaintance;
 	std::string network_host();
 	void set_network_host(const std::string& host);
 
-	unsigned int get_ping_timeout();
-
 	std::string campaign_server();
 	void set_campaign_server(const std::string& host);