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

adjust order latency dynamically by client ping, closes #2990

Browse Source
This commit is contained in:
Matthias Mailänder
2013-04-07 22:22:42 +02:00
parent 7f835cf438
commit f8e44b792f
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,7 +82,7 @@ namespace OpenRA.Network
public string Map; public string Map;
public string[] Ban; public string[] Ban;
public string[] Mods = { "ra" }; // mod names public string[] Mods = { "ra" }; // mod names
public int OrderLatency = 3; public int OrderLatency = 3; // x 40 = ms
public int RandomSeed = 0; public int RandomSeed = 0;
public bool FragileAlliances = false; // Allow diplomatic stance changes after game start. public bool FragileAlliances = false; // Allow diplomatic stance changes after game start.
public bool AllowCheats = false; public bool AllowCheats = false;

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

@@ -164,8 +164,7 @@ namespace OpenRA.Network
&& !orderManager.GameStarted) && !orderManager.GameStarted)
{ {
orderManager.FramesAhead = orderManager.LobbyInfo.GlobalSettings.OrderLatency; orderManager.FramesAhead = orderManager.LobbyInfo.GlobalSettings.OrderLatency;
Game.Debug( Game.Debug("Order lag is now {0} frames.".F(orderManager.LobbyInfo.GlobalSettings.OrderLatency));
"Order lag is now {0} frames.".F(orderManager.LobbyInfo.GlobalSettings.OrderLatency));
} }
Game.SyncLobbyInfo(); Game.SyncLobbyInfo();
break; break;

16
OpenRA.Game/Server/Server.cs
View File

@@ -64,6 +64,8 @@ namespace OpenRA.Server
public Map Map; public Map Map;
XTimer gameTimeout; XTimer gameTimeout;
int highestLatency;
protected volatile ServerState pState = new ServerState(); protected volatile ServerState pState = new ServerState();
public ServerState State public ServerState State
{ {
@@ -341,6 +343,14 @@ namespace OpenRA.Server
t.ClientJoined(this, newConn); t.ClientJoined(this, newConn);
SendChat(newConn, "has joined the game. Ping: {0} ms".F(newConn.Latency)); SendChat(newConn, "has joined the game. Ping: {0} ms".F(newConn.Latency));
if (newConn.Latency > highestLatency)
highestLatency = newConn.Latency;
lobbyInfo.GlobalSettings.OrderLatency = highestLatency / 40; // 1 frame is 40 ms
if (lobbyInfo.GlobalSettings.OrderLatency < 1) // should never be 0
lobbyInfo.GlobalSettings.OrderLatency = 1;
SyncLobbyInfo(); SyncLobbyInfo();
if (File.Exists("{0}motd_{1}.txt".F(Platform.SupportDir, lobbyInfo.GlobalSettings.Mods[0]))) if (File.Exists("{0}motd_{1}.txt".F(Platform.SupportDir, lobbyInfo.GlobalSettings.Mods[0])))
@@ -360,6 +370,8 @@ namespace OpenRA.Server
if (mods.Any(m => m.Contains("{DEV_VERSION}"))) if (mods.Any(m => m.Contains("{DEV_VERSION}")))
SendChat(newConn, "is running a non-versioned development build, "+ SendChat(newConn, "is running a non-versioned development build, "+
"and may cause desync if it contains any incompatible changes."); "and may cause desync if it contains any incompatible changes.");
Game.Debug("Order lag has been adjusted to {0} frames.".F(lobbyInfo.GlobalSettings.OrderLatency));
} }
catch (Exception) { DropClient(newConn); } catch (Exception) { DropClient(newConn); }
} }
@@ -532,7 +544,9 @@ namespace OpenRA.Server
SendChat(toDrop, "Admin left! {0} is a new admin now!".F(lastClient.Name)); SendChat(toDrop, "Admin left! {0} is a new admin now!".F(lastClient.Name));
} }
} }
//TODO: if (highestLatency == toDrop.Latency) then find the new highestLatency
DispatchOrders( toDrop, toDrop.MostRecentFrame, new byte[] { 0xbf } ); DispatchOrders( toDrop, toDrop.MostRecentFrame, new byte[] { 0xbf } );
if (conns.Count != 0 || lobbyInfo.GlobalSettings.Dedicated) if (conns.Count != 0 || lobbyInfo.GlobalSettings.Dedicated)