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

Merge pull request #9389 from Herve-M/fix-replay

Browse Source 
Fix replay freeze
This commit is contained in:
RoosterDragon
2015-10-25 21:20:11 +00:00
parent 744d66955a 4366593b33
commit 0ca1805ea7
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@@ -61,6 +61,7 @@ Also thanks to:
* Gordon Martin (Happy0) * Gordon Martin (Happy0)
* Guido Lipke (LipkeGu) * Guido Lipke (LipkeGu)
* Gyula Zimmermann (Graion Dilach) * Gyula Zimmermann (Graion Dilach)
* Hervé Matysiak (Herve-M)
* Huw Pascoe * Huw Pascoe
* Ian T. Jacobsen (Smilex) * Ian T. Jacobsen (Smilex)
* Imago * Imago

28
OpenRA.Game/Network/ReplayConnection.cs
View File

@@ -27,6 +27,7 @@ namespace OpenRA.Network
Queue<Chunk> chunks = new Queue<Chunk>(); Queue<Chunk> chunks = new Queue<Chunk>();
List<byte[]> sync = new List<byte[]>(); List<byte[]> sync = new List<byte[]>();
int ordersFrame; int ordersFrame;
Dictionary<int, int> lastClientsFrame = new Dictionary<int, int>();
public int LocalClientId { get { return 0; } } public int LocalClientId { get { return 0; } }
public ConnectionState ConnectionState { get { return ConnectionState.Connected; } } public ConnectionState ConnectionState { get { return ConnectionState.Connected; } }
@@ -55,6 +56,14 @@ namespace OpenRA.Network
var frame = BitConverter.ToInt32(packet, 0); var frame = BitConverter.ToInt32(packet, 0);
chunk.Packets.Add(Pair.New(client, packet)); chunk.Packets.Add(Pair.New(client, packet));
if (frame != int.MaxValue)
{
if (!lastClientsFrame.ContainsKey(client))
lastClientsFrame[client] = frame;
else if (frame > lastClientsFrame[client])
lastClientsFrame[client] = frame;
}
if (packet.Length == 5 && packet[4] == 0xBF) if (packet.Length == 5 && packet[4] == 0xBF)
continue; // disconnect continue; // disconnect
else if (packet.Length >= 5 && packet[4] == 0x65) else if (packet.Length >= 5 && packet[4] == 0x65)
@@ -81,6 +90,25 @@ namespace OpenRA.Network
TickCount = Math.Max(TickCount, frame); TickCount = Math.Max(TickCount, frame);
} }
} }
// 2nd parse : replace all disconnect packets without frame with real
// disconnect frame
// NOTE: to modify/remove if a reconnect feature is set
foreach (var tmpChunk in chunks)
{
foreach (var tmpPacketPair in tmpChunk.Packets)
{
var client = tmpPacketPair.First;
var packet = tmpPacketPair.Second;
if (packet.Length == 5 && packet[4] == 0xBF)
{
int lastClientFrame = lastClientsFrame[client];
byte[] lastFramePacket = BitConverter.GetBytes(lastClientFrame);
if (lastFramePacket.Length == 4)
Array.Copy(lastFramePacket, packet, lastFramePacket.Length);
}
}
}
} }
ordersFrame = LobbyInfo.GlobalSettings.OrderLatency; ordersFrame = LobbyInfo.GlobalSettings.OrderLatency;