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

Remove custom network frame counting from ReplayConnection

Browse Source
This commit is contained in:
abcdefg30
2023-01-02 23:46:00 +01:00
committed by Paul Chote
parent 56ff98a2a3
commit d4d6d5b7c0
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,6 @@ namespace OpenRA.Network
readonly Queue<Chunk> chunks = new Queue<Chunk>(); readonly Queue<Chunk> chunks = new Queue<Chunk>();
readonly Queue<(int Frame, int SyncHash, ulong DefeatState)> sync = new Queue<(int, int, ulong)>(); readonly Queue<(int Frame, int SyncHash, ulong DefeatState)> sync = new Queue<(int, int, ulong)>();
readonly int orderLatency; readonly int orderLatency;
int ordersFrame;
public readonly int TickCount; public readonly int TickCount;
public readonly int FinalGameTick; public readonly int FinalGameTick;
@@ -91,7 +90,6 @@ namespace OpenRA.Network
var gameSpeeds = Game.ModData.Manifest.Get<GameSpeeds>(); var gameSpeeds = Game.ModData.Manifest.Get<GameSpeeds>();
var gameSpeedName = LobbyInfo.GlobalSettings.OptionOrDefault("gamespeed", gameSpeeds.DefaultSpeed); var gameSpeedName = LobbyInfo.GlobalSettings.OptionOrDefault("gamespeed", gameSpeeds.DefaultSpeed);
orderLatency = gameSpeeds.Speeds[gameSpeedName].OrderLatency; orderLatency = gameSpeeds.Speeds[gameSpeedName].OrderLatency;
ordersFrame = orderLatency;
} }
void IConnection.StartGame() { } void IConnection.StartGame() { }
@@ -103,9 +101,6 @@ namespace OpenRA.Network
void IConnection.SendSync(int frame, int syncHash, ulong defeatState) void IConnection.SendSync(int frame, int syncHash, ulong defeatState)
{ {
sync.Enqueue((frame, syncHash, defeatState)); sync.Enqueue((frame, syncHash, defeatState));
// Store the current frame so Receive() can return the next chunk of orders.
ordersFrame = frame + orderLatency;
} }
void IConnection.Receive(OrderManager orderManager) void IConnection.Receive(OrderManager orderManager)
@@ -113,7 +108,7 @@ namespace OpenRA.Network
while (sync.Count != 0) while (sync.Count != 0)
orderManager.ReceiveSync(sync.Dequeue()); orderManager.ReceiveSync(sync.Dequeue());
while (chunks.Count != 0 && chunks.Peek().Frame <= ordersFrame) while (chunks.Count != 0 && chunks.Peek().Frame <= orderManager.NetFrameNumber + orderLatency)
{ {
foreach (var o in chunks.Dequeue().Packets) foreach (var o in chunks.Dequeue().Packets)
{ {