Fix replays

adammitchelldev · Jan 17, 2021 · 6d6d2a8 · 6d6d2a8
1 parent 58fc6ed
commit 6d6d2a8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/OpenRA.Game/Network/OrderManager.cs b/OpenRA.Game/Network/OrderManager.cs
@@ -59,6 +59,9 @@ public int SuggestedTimestep
 				if (World == null)
 					return Game.Timestep;
 
+				if (!ShouldUseCatchUp)
+					return World.Timestep;
+
 				if (IsStalling || World.IsLoadingGameSave)
 					return 1;
 

diff --git a/OpenRA.Game/Network/ReplayConnection.cs b/OpenRA.Game/Network/ReplayConnection.cs
@@ -124,7 +124,7 @@ public ReplayConnection(string replayFilename)
 				}
 			}
 
-			ordersFrame = LobbyInfo.GlobalSettings.OrderLatency; // TODO Fix when adaptive order latency is on
+			ordersFrame = LobbyInfo.GlobalSettings.UseNewNetcode ? 1 : LobbyInfo.GlobalSettings.OrderLatency;
 		}
 
 		// Do nothing: ignore locally generated orders
-Original file line number
+Diff line change
@@ Expand Up / @@ -124,7 +124,7 @@ public ReplayConnection(string replayFilename) @@
     				}
     			}
-    			ordersFrame = LobbyInfo.GlobalSettings.OrderLatency; // TODO Fix when adaptive order latency is on
+    			ordersFrame = LobbyInfo.GlobalSettings.UseNewNetcode ? 1 : LobbyInfo.GlobalSettings.OrderLatency;
     		}
     		// Do nothing: ignore locally generated orders
@@ Expand Down @@