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

Protocol: add defeat state bitfields to Sync packets

Browse Source 
Signed-off-by: Paul Chote <pchote@users.noreply.github.com>
This commit is contained in:
Clément Bœsch
2020-07-05 19:25:35 +02:00
committed by abcdefg30
parent 60df247416
commit 11f57b2b26
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,13 +31,14 @@ namespace OpenRA.Network
return ret; return ret;
} }
public static byte[] SerializeSync(int sync) public static byte[] SerializeSync(int sync, ulong defeatState)
{ {
var ms = new MemoryStream(1 + 4); var ms = new MemoryStream(1 + 4 + 8);
using (var writer = new BinaryWriter(ms)) using (var writer = new BinaryWriter(ms))
{ {
writer.Write((byte)OrderType.SyncHash); writer.Write((byte)OrderType.SyncHash);
writer.Write(sync); writer.Write(sync);
writer.Write(defeatState);
} }
return ms.GetBuffer(); return ms.GetBuffer();

11
OpenRA.Game/Network/OrderManager.cs
View File

@@ -192,9 +192,16 @@ namespace OpenRA.Network
UnitOrders.ProcessOrder(this, World, order.Client, order.Order); UnitOrders.ProcessOrder(this, World, order.Client, order.Order);
if (NetFrameNumber + FramesAhead >= GameSaveLastSyncFrame) if (NetFrameNumber + FramesAhead >= GameSaveLastSyncFrame)
Connection.SendSync(NetFrameNumber, OrderIO.SerializeSync(World.SyncHash())); {
var defeatState = 0UL;
for (var i = 0; i < World.Players.Length; i++)
if (World.Players[i].WinState == WinState.Lost)
defeatState |= 1UL << i;
Connection.SendSync(NetFrameNumber, OrderIO.SerializeSync(World.SyncHash(), defeatState));
}
else else
Connection.SendSync(NetFrameNumber, OrderIO.SerializeSync(0)); Connection.SendSync(NetFrameNumber, OrderIO.SerializeSync(0, 0));
if (generateSyncReport) if (generateSyncReport)
using (new PerfSample("sync_report")) using (new PerfSample("sync_report"))

4
OpenRA.Game/Server/ProtocolVersion.cs
View File

@@ -25,6 +25,8 @@ namespace OpenRA.Server
// Order types are: // Order types are:
// - 0x65: World sync hash: // - 0x65: World sync hash:
// - Int32 containing the sync hash value // - Int32 containing the sync hash value
// - UInt64 containing the current defeat state (a bit set
// to 1 means the corresponding player is defeated)
// - 0xBF: Player disconnected // - 0xBF: Player disconnected
// - 0xFE: Handshake (also used for ServerOrders for ProtocolVersion.Orders < 8) // - 0xFE: Handshake (also used for ServerOrders for ProtocolVersion.Orders < 8)
// - Length-prefixed string specifying a name or key // - Length-prefixed string specifying a name or key
@@ -66,6 +68,6 @@ namespace OpenRA.Server
// The protocol for server and world orders // The protocol for server and world orders
// This applies after the handshake has completed, and is provided to support // This applies after the handshake has completed, and is provided to support
// alternative server implementations that wish to support multiple versions in parallel // alternative server implementations that wish to support multiple versions in parallel
public const int Orders = 10; public const int Orders = 11;
} }
} }