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

Allow the server to ack no or multiple packets in the same frame.

Browse Source
This commit is contained in:
Paul Chote
2021-09-25 15:09:23 +01:00
committed by abcdefg30
parent a13d046304
commit 2d08f2bbfd
4 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenRA.Game/Network/OrderIO.cs
View File

@@ -63,6 +63,20 @@ namespace OpenRA.Network
ms.WriteArray(o.Serialize());
return ms.ToArray();
}
public static OrderPacket Combine(IEnumerable<OrderPacket> packets)
{
var orders = new List<Order>();
foreach (var packet in packets)
{
if (packet.orders == null)
throw new InvalidOperationException("OrderPacket.Combine can only be used with locally generated OrderPackets.");
orders.AddRange(packet.orders);
}
return new OrderPacket(orders.ToArray());
}
}
public static class OrderIO
@@ -130,16 +144,17 @@ namespace OpenRA.Network
return true;
}
public static bool TryParseAck((int FromClient, byte[] Data) packet, out int frame)
public static bool TryParseAck((int FromClient, byte[] Data) packet, out int frame, out byte count)
{
// Ack packets are only accepted from the server
if (packet.FromClient != 0 || packet.Data.Length != 5 || packet.Data[4] != (byte)OrderType.Ack)
if (packet.FromClient != 0 || packet.Data.Length != 6 || packet.Data[4] != (byte)OrderType.Ack)
{
frame = 0;
frame = count = 0;
return false;
}
frame = BitConverter.ToInt32(packet.Data, 0);
count = packet.Data[5];
return true;
}