split latency from Client into ClientPing

closes #4282

OpenRA.Game/Network/Session.cs

@@ -18,6 +18,7 @@ namespace OpenRA.Network
 	public class Session
 	{
 		public List<Client> Clients = new List<Client>();
+		public List<ClientPing> ClientPings = new List<ClientPing>();
 
 		// Keyed by the PlayerReference id that the slot corresponds to
 		public Dictionary<string, Slot> Slots = new Dictionary<string, Slot>();
@@ -45,6 +46,10 @@ namespace OpenRA.Network
 							session.Clients.Add(FieldLoader.Load<Client>(y.Value));
 							break;
 
+							case "ClientPing":
+							session.ClientPings.Add(FieldLoader.Load<ClientPing>(y.Value));
+							break;
+
 							case "Slot":
 							var s = FieldLoader.Load<Slot>(y.Value);
 							session.Slots.Add(s.PlayerReference, s);
@@ -107,6 +112,23 @@ namespace OpenRA.Network
 			public bool IsReady { get { return State == ClientState.Ready; } }
 			public bool IsInvalid { get { return State == ClientState.Invalid; } }
 			public bool IsObserver { get { return Slot == null; } }
+
+			public string Serialize()
+			{
+				var clientData = new List<MiniYamlNode>();
+				clientData.Add(new MiniYamlNode("Client@{0}".F(this.Index), FieldSaver.Save(this)));
+				return clientData.WriteToString();
+			}
+		}
+
+		public ClientPing PingFromClient(Client client)
+		{
+			return ClientPings.SingleOrDefault(p => p.Index == client.Index);
+		}
+
+		public class ClientPing
+		{
+			public int Index;
 			public int Latency = -1;
 			public int LatencyJitter = -1;
 			public int[] LatencyHistory = { };
@@ -114,7 +136,7 @@ namespace OpenRA.Network
 			public string Serialize()
 			{
 				var clientData = new List<MiniYamlNode>();
-				clientData.Add(new MiniYamlNode("Client@{0}".F(this.Index), FieldSaver.Save(this)));
+				clientData.Add(new MiniYamlNode("ClientPing@{0}".F(this.Index), FieldSaver.Save(this)));
 				return clientData.WriteToString();
 			}
 		}
@@ -174,6 +196,9 @@ namespace OpenRA.Network
 			foreach (var client in Clients)
 				sessionData.Append(client.Serialize());
 
+			foreach (var clientPing in ClientPings)
+				sessionData.Append(clientPing.Serialize());
+
 			foreach (var slot in Slots)
 				sessionData.Append(slot.Value.Serialize());
 

OpenRA.Game/Network/UnitOrders.cs

@@ -218,6 +218,21 @@ namespace OpenRA.Network
 						break;
 					}
 
+				case "SyncClientPings":
+					{
+						var pings = new List<Session.ClientPing>();
+						var nodes = MiniYaml.FromString(order.TargetString);
+						foreach (var node in nodes)
+						{
+							var strings = node.Key.Split('@');
+							if (strings[0] == "ClientPing")
+								pings.Add(FieldLoader.Load<Session.ClientPing>(node.Value));
+						}
+
+						orderManager.LobbyInfo.ClientPings = pings;
+						break;
+					}
+
 				case "SetStance":
 					{
 						if (!Game.orderManager.LobbyInfo.GlobalSettings.FragileAlliances)