epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

split lobby SyncInfo order into smaller chunks

Browse Source 
closes #4594
This commit is contained in:
Matthias Mailänder
2014-04-16 17:29:26 +02:00
parent 0f591bb3ba
commit f365f9da2b
5 changed files with 166 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
OpenRA.Game/Network/Session.cs
View File

@@ -110,6 +110,13 @@ namespace OpenRA.Network
public int Latency = -1;
public int LatencyJitter = -1;
public int[] LatencyHistory = { };
public string Serialize()
{
var clientData = new List<MiniYamlNode>();
clientData.Add(new MiniYamlNode("Client@{0}".F(this.Index), FieldSaver.Save(this)));
return clientData.WriteToString();
}
}
public class Slot
@@ -123,6 +130,13 @@ namespace OpenRA.Network
public bool LockTeam;
public bool LockSpawn;
public bool Required;
public string Serialize()
{
var slotData = new List<MiniYamlNode>();
slotData.Add(new MiniYamlNode("Slot@{0}".F(this.PlayerReference), FieldSaver.Save(this)));
return slotData.WriteToString();
}
}
public class Global
@@ -144,21 +158,28 @@ namespace OpenRA.Network
public string StartingUnitsClass = "none";
public bool AllowVersionMismatch;
public string GameUid;
public string Serialize()
{
var globalData = new List<MiniYamlNode>();
globalData.Add(new MiniYamlNode("GlobalSettings", FieldSaver.Save(this)));
return globalData.WriteToString();
}
}
public string Serialize()
{
var clientData = new List<MiniYamlNode>();
var sessionData = new System.Text.StringBuilder();
foreach (var client in Clients)
clientData.Add(new MiniYamlNode("Client@{0}".F(client.Index), FieldSaver.Save(client)));
sessionData.Append(client.Serialize());
foreach (var slot in Slots)
clientData.Add(new MiniYamlNode("Slot@{0}".F(slot.Key), FieldSaver.Save(slot.Value)));
sessionData.Append(slot.Value.Serialize());
clientData.Add(new MiniYamlNode("GlobalSettings", FieldSaver.Save(GlobalSettings)));
sessionData.Append(GlobalSettings.Serialize());
return clientData.WriteToString();
return sessionData.ToString();
}
}
}

62
OpenRA.Game/Network/UnitOrders.cs
View File

@@ -8,6 +8,7 @@
*/
#endregion
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using OpenRA.Traits;
@@ -162,13 +163,57 @@ namespace OpenRA.Network
case "SyncInfo":
{
orderManager.LobbyInfo = Session.Deserialize(order.TargetString);
SetOrderLag(orderManager);
Game.SyncLobbyInfo();
break;
}
if (orderManager.FramesAhead != orderManager.LobbyInfo.GlobalSettings.OrderLatency
&& !orderManager.GameStarted)
case "SyncLobbyClients":
{
var clients = new List<Session.Client>();
var nodes = MiniYaml.FromString(order.TargetString);
foreach (var node in nodes)
{
orderManager.FramesAhead = orderManager.LobbyInfo.GlobalSettings.OrderLatency;
Log.Write("server", "Order lag is now {0} frames.", orderManager.LobbyInfo.GlobalSettings.OrderLatency);
var strings = node.Key.Split('@');
if (strings[0] == "Client")
clients.Add(FieldLoader.Load<Session.Client>(node.Value));
}
orderManager.LobbyInfo.Clients = clients;
Game.SyncLobbyInfo();
break;
}
case "SyncLobbySlots":
{
var slots = new Dictionary<string, Session.Slot>();
var nodes = MiniYaml.FromString(order.TargetString);
foreach (var node in nodes)
{
var strings = node.Key.Split('@');
if (strings[0] == "Slot")
{
var slot = FieldLoader.Load<Session.Slot>(node.Value);
slots.Add(slot.PlayerReference, slot);
}
}
orderManager.LobbyInfo.Slots = slots;
Game.SyncLobbyInfo();
break;
}
case "SyncLobbyGlobalSettings":
{
var nodes = MiniYaml.FromString(order.TargetString);
foreach (var node in nodes)
{
var strings = node.Key.Split('@');
if (strings[0] == "GlobalSettings")
FieldLoader.Load(orderManager.LobbyInfo.GlobalSettings, node.Value);
}
SetOrderLag(orderManager);
Game.SyncLobbyInfo();
break;
}
@@ -227,5 +272,14 @@ namespace OpenRA.Network
foreach (var nsc in w.ActorsWithTrait<INotifyStanceChanged>())
nsc.Trait.StanceChanged(nsc.Actor, p, target, oldStance, s);
}
static void SetOrderLag(OrderManager o)
{
if (o.FramesAhead != o.LobbyInfo.GlobalSettings.OrderLatency && !o.GameStarted)
{
o.FramesAhead = o.LobbyInfo.GlobalSettings.OrderLatency;
Log.Write("server", "Order lag is now {0} frames.", o.LobbyInfo.GlobalSettings.OrderLatency);
}
}
}
}