diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs index a484b2c2df..87fdcf7cdb 100644 --- a/OpenRA.Game/Game.cs +++ b/OpenRA.Game/Game.cs @@ -459,23 +459,6 @@ namespace OpenRA return orderManager != null && orderManager.world == world; } - public static void JoinExternalGame() - { - var addressParts = Game.Settings.Game.ConnectTo.Split( - new [] { ':' }, StringSplitOptions.RemoveEmptyEntries); - - if (addressParts.Length < 1 || addressParts.Length > 2) - return; - - var host = addressParts[0]; - var port = Exts.WithDefault(1234, () => int.Parse(addressParts[1])); - - Game.Settings.Game.ConnectTo = ""; - Game.Settings.Save(); - - Game.JoinServer(host, port); - } - public static bool DownloadMap(string mapHash) { try diff --git a/OpenRA.Game/GameRules/Settings.cs b/OpenRA.Game/GameRules/Settings.cs index 52166860f1..77908fe1cc 100644 --- a/OpenRA.Game/GameRules/Settings.cs +++ b/OpenRA.Game/GameRules/Settings.cs @@ -130,7 +130,6 @@ namespace OpenRA.GameRules // Internal game settings public int Timestep = 40; - public string ConnectTo = ""; public bool AllowDownloading = true; public string MapRepository = "http://content.open-ra.org/map/"; } diff --git a/OpenRA.Mods.Cnc/CncLoadScreen.cs b/OpenRA.Mods.Cnc/CncLoadScreen.cs index 2fd58ab0a4..8d2c2de1ae 100644 --- a/OpenRA.Mods.Cnc/CncLoadScreen.cs +++ b/OpenRA.Mods.Cnc/CncLoadScreen.cs @@ -120,7 +120,6 @@ namespace OpenRA.Mods.Cnc public void StartGame() { TestAndContinue(); - Game.JoinExternalGame(); } void TestAndContinue() diff --git a/OpenRA.Mods.D2k/D2kLoadScreen.cs b/OpenRA.Mods.D2k/D2kLoadScreen.cs index a112e1a434..cef13195fe 100644 --- a/OpenRA.Mods.D2k/D2kLoadScreen.cs +++ b/OpenRA.Mods.D2k/D2kLoadScreen.cs @@ -70,7 +70,6 @@ namespace OpenRA.Mods.D2k public void StartGame() { TestAndContinue(); - Game.JoinExternalGame(); } void TestAndContinue() diff --git a/OpenRA.Mods.RA/RALoadScreen.cs b/OpenRA.Mods.RA/RALoadScreen.cs index 3f7871f875..258bb1963d 100644 --- a/OpenRA.Mods.RA/RALoadScreen.cs +++ b/OpenRA.Mods.RA/RALoadScreen.cs @@ -74,7 +74,6 @@ namespace OpenRA.Mods.RA public void StartGame() { TestAndContinue(); - Game.JoinExternalGame(); } void TestAndContinue()