From 3b89110202ed9abc1a3ada8d26e6640b05c4a867 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Wed, 16 Mar 2011 11:02:17 +1300 Subject: [PATCH] fix some bogosity in MasterServerPinger (still not right) --- .../ServerTraits/MasterServerPinger.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/OpenRA.Mods.RA/ServerTraits/MasterServerPinger.cs b/OpenRA.Mods.RA/ServerTraits/MasterServerPinger.cs index ca7a1d4519..3571c379e4 100644 --- a/OpenRA.Mods.RA/ServerTraits/MasterServerPinger.cs +++ b/OpenRA.Mods.RA/ServerTraits/MasterServerPinger.cs @@ -37,16 +37,16 @@ namespace OpenRA.Mods.RA.Server public void LobbyInfoSynced(S server) { PingMasterServer(server); } public void GameStarted(S server) { PingMasterServer(server); } - static int lastPing = 0; + int lastPing = 0; // Todo: use the settings passed to the server instead - static bool isInternetServer = Game.Settings.Server.AdvertiseOnline; - static string masterServerUrl = Game.Settings.Server.MasterServer; - static int externalPort = Game.Settings.Server.ExternalPort; - static bool isInitialPing = true; + bool isInternetServer = Game.Settings.Server.AdvertiseOnline; + string masterServerUrl = Game.Settings.Server.MasterServer; + int externalPort = Game.Settings.Server.ExternalPort; + bool isInitialPing = true; - static volatile bool isBusy; - static Queue masterServerMessages = new Queue(); - public static void PingMasterServer(S server) + volatile bool isBusy; + Queue masterServerMessages = new Queue(); + public void PingMasterServer(S server) { if (isBusy || !isInternetServer) return;