Address review cleanup requests

OpenRA.Game/Game.cs

@@ -609,9 +609,7 @@ static void InnerLogicTick(OrderManager orderManager)
 
 			var worldTickDelta = tick - orderManager.LastTickTime;
 			if (worldTimestep == 0 || worldTickDelta < worldTimestep)
-			{
 				return;
-			}
 
 			using (new PerfSample("tick_time"))
 			{
@@ -840,7 +838,6 @@ static void Loop()
 						LogicTick();
 
 						// Force at least one render per tick during regular gameplay
-						// TODO: Have OrderManager tell us when we should force render
 						if (!OrderManager.IsStalling && !(OrderManager.CatchUpFrames > 2) && OrderManager.World != null && !OrderManager.World.IsLoadingGameSave && !OrderManager.World.IsReplay)
 							renderBeforeNextTick = true;
 					}

OpenRA.Game/Network/Connection.cs

@@ -353,7 +353,7 @@ void Ack(byte[] buf)
 				byte[] queuedPacket = default;
 				if (awaitingAckPackets.Count > 0 && !awaitingAckPackets.TryDequeue(out queuedPacket))
 				{
-					// The dequeing failed because of concurrency, so we retry
+					// The dequeuing failed because of concurrency, so we retry
 					for (var c = 0; c < 5; c++)
 					{
 						if (awaitingAckPackets.TryDequeue(out queuedPacket))
@@ -384,7 +384,7 @@ public override void SendSync(int frame, byte[] syncData)
 				ms.WriteArray(BitConverter.GetBytes(frame));
 				ms.WriteArray(syncData);
 
-				queuedSyncPackets.Add(ms.GetBuffer()); // TODO: re-add sync packets
+				queuedSyncPackets.Add(ms.GetBuffer());
 			}
 		}
 
@@ -402,16 +402,14 @@ public override void Send(int frame, IEnumerable<byte[]> orders)
 				using (var ackMs = new MemoryStream(ordersLength))
 				{
 					foreach (var o in orders)
-					{
 						ackMs.WriteArray(o);
-					}
 
 					ackArray = ackMs.GetBuffer();
 				}
 
 				if (UseNewNetcode)
 				{
-					awaitingAckPackets.Enqueue(ackArray); // TODO fix having to write byte buffer twice
+					awaitingAckPackets.Enqueue(ackArray);
 				}
 				else
 				{

OpenRA.Game/Network/FrameData.cs

@@ -9,7 +9,6 @@
  */
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -44,7 +43,6 @@ public void AddClient(int clientId)
 
 		public void ClientQuit(int clientId)
 		{
-			// TODO review whether we need to specify quit frame
 			quitClients.Add(clientId);
 		}
 

OpenRA.Game/Network/OrderManager.cs

@@ -93,9 +93,6 @@ public void StartGame()
 			NetFrameNumber = 1;
 			NextOrderFrame = 1;
 
-			// HACK: FramesAhead is only ever 0 in singleplayer, so we increase the rate of apparent net ticks to decrease latency
-			// if (OrderLatency == 0)
-			// 	NetTickScale = 1;
 			if (LobbyInfo.GlobalSettings.UseNewNetcode)
 				localImmediateOrders.Add(Order.FromTargetString("Loaded", "", true));
 			else

OpenRA.Game/Network/ReplayConnection.cs

@@ -162,11 +162,6 @@ public void Receive(Action<int, byte[]> packetFn)
 			}
 		}
 
-		public int LastAckedFrame
-		{
-			get { return ordersFrame;  }
-		}
-
 		public void Dispose() { }
 	}
 }

OpenRA.Game/Server/Connection.cs

@@ -153,7 +153,7 @@ public void Flush(Server server)
 			}
 		}
 
-		private void InnerSend(byte[] data)
+		void InnerSend(byte[] data)
 		{
 			var start = 0;
 			var length = data.Length;

OpenRA.Game/Server/OrderBuffer.cs

@@ -10,9 +10,7 @@
 #endregion
 
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace OpenRA.Server
 {

OpenRA.Game/Server/Server.cs

@@ -811,7 +811,6 @@ public void DispatchOrdersToOtherClients(Connection conn, int frame, byte[] data
 			foreach (var c in Conns.Except(conn).ToList())
 				DispatchFrameToClient(c, frameData, buffer);
 
-			/*
 			if (recorder != null)
 			{
 				recorder.ReceiveFrame(from, frame, data);
@@ -824,7 +823,6 @@ public void DispatchOrdersToOtherClients(Connection conn, int frame, byte[] data
 						Log.Write("server", "Dropped sync order with length {0} from client {1}. Expected length {2}.".F(data.Length, from, Order.SyncHashOrderLength));
 				}
 			}
-			*/
 
 			// TODO: Make this nicer
 			if (GameSave != null && conn != null)
@@ -849,8 +847,7 @@ public void ReceiveOrders(Connection conn, int frame, byte[] data)
 			if (frame == 0 && conn != null)
 			{
 				InterpretServerOrders(conn, data);
-				if (GameSave != null)
-					GameSave.DispatchOrders(conn, frame, data);
+				GameSave?.DispatchOrders(conn, frame, data);
 			}
 
 			// TODO: Find a less hacky way to deal with synchash relaying
@@ -868,11 +865,9 @@ public void DispatchBufferedOrdersToOtherClients(int fromClient, List<byte[]> al
 		{
 			var ms = new MemoryStream(allData.Select(d => d.Length).Sum());
 			foreach (var data in allData)
-			{
 				ms.WriteArray(data);
-			}
 
-			Connection conn = Conns.FirstOrDefault(c => c.PlayerIndex == fromClient);
+			var conn = Conns.FirstOrDefault(c => c.PlayerIndex == fromClient);
 			DispatchOrdersToOtherClients(conn, serverGame.CurrentNetFrame, ms.ToArray(), true);
 		}
 
@@ -886,7 +881,7 @@ public void DispatchBufferedOrderAcks(int forClient, int acks)
 			writer.Write((byte)OrderType.Ack);
 			writer.Write((short)acks);
 
-			Connection conn = Conns.FirstOrDefault(c => c.PlayerIndex == forClient);
+			var conn = Conns.FirstOrDefault(c => c.PlayerIndex == forClient);
 
 			// Send acks to client from themselves
 			DispatchOrdersToClient(conn, forClient, serverGame.CurrentNetFrame, ms.ToArray(), true);
@@ -965,8 +960,7 @@ void InterpretServerOrder(Connection conn, Order o)
 						break;
 					case "Pong":
 						{
-							long pingSent;
-							if (!OpenRA.Exts.TryParseInt64Invariant(o.TargetString, out pingSent))
+							if (!OpenRA.Exts.TryParseInt64Invariant(o.TargetString, out var pingSent))
 							{
 								Log.Write("server", "Invalid order pong payload: {0}", o.TargetString);
 								break;
@@ -1186,8 +1180,7 @@ public void DropClient(Connection toDrop)
 							}
 						}
 
-						if (serverGame != null)
-							serverGame.OrderBuffer.DropClient(toDrop.PlayerIndex);
+						serverGame?.OrderBuffer.DropClient(toDrop.PlayerIndex);
 
 						DispatchServerCreatedOrdersToAllClients(toDrop, toDrop.MostRecentFrame, new[] { (byte)OrderType.Disconnect });
 
@@ -1358,17 +1351,6 @@ public void StartGame()
 					GameState = GameState.Playing;
 				}
 
-				// TODO remove: this "pre-disconnecting" method adds unnecessary complexity just for the sake of the replay stream
-				/*var disconnectData = new[] { (byte)OrderType.Disconnect };
-				foreach (var c in Conns)
-				{
-					foreach (var d in Conns)
-						DispatchOrdersToClient(c, d.PlayerIndex, int.MaxValue, disconnectData);
-
-					if (recorder != null)
-						recorder.ReceiveFrame(c.PlayerIndex, int.MaxValue, disconnectData);
-				}*/
-
 				if (GameSave == null && LobbyInfo.GlobalSettings.GameSavesEnabled)
 					GameSave = new GameSave();
 

OpenRA.Game/Server/ServerGame.cs

@@ -9,8 +9,6 @@
  */
 #endregion
 
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 
 namespace OpenRA.Server