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

fix round-trip-time bug

Browse Source
This commit is contained in:
Bob
2010-03-10 17:33:04 +13:00
parent 79ce7c15d5
commit 962f1fa9b7
4 changed files with 42 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,7 +156,6 @@ namespace OpenRA.Server
if (conns.All(c => inFlightFrames[conn.Frame].Contains(c)))
{
inFlightFrames.Remove(conn.Frame);
DispatchOrders(null, conn.Frame, new byte[] { 0xef });
}
}
}
@@ -431,10 +430,14 @@ namespace OpenRA.Server
SyncLobbyInfo();
// start the game if everyone is ready.
if (conns.All(c => GetClient(c).State == Session.ClientState.Ready))
if (conns.Count > 0 && conns.All(c => GetClient(c).State == Session.ClientState.Ready))
{
Console.WriteLine("All players are ready. Starting the game!");
GameStarted = true;
foreach( var c in conns )
foreach( var d in conns )
DispatchOrdersToClient( c, d.PlayerIndex, 0x7FFFFFFF, new byte[] { 0xBF } );
DispatchOrders(null, 0,
new ServerOrder("StartGame", "").Serialize());
}
@@ -494,15 +497,9 @@ namespace OpenRA.Server
lobbyInfo.Clients.RemoveAll(c => c.Index == toDrop.PlayerIndex);
/* don't get stuck waiting for the dropped player, if they were the one holding up a frame */
foreach( var c in conns )
DispatchOrders( toDrop, toDrop.MostRecentFrame, new byte[] { 0xbf } );
foreach( var f in inFlightFrames.ToArray() )
if (conns.All(c => f.Value.Contains(c)))
{
inFlightFrames.Remove(f.Key);
DispatchOrders(null, f.Key, new byte[] { 0xef });
}
if (conns.Count == 0) OnServerEmpty();
else SyncLobbyInfo();
}