Merge pull request #3441 from Mailaender/display-server-error

Display ServerError in CONNECTIONFAILED_PANEL

OpenRA.Game/Game.cs

@@ -162,7 +162,7 @@ namespace OpenRA
 					if (orderManager.GameStarted)
 						++Viewport.TicksSinceLastMove;
 					Sound.Tick();
-					Sync.CheckSyncUnchanged( world, () => { orderManager.TickImmediate(); } );
+					Sync.CheckSyncUnchanged(world, orderManager.TickImmediate);
 
 					if (world != null)
 					{
@@ -315,7 +315,6 @@ namespace OpenRA
 			Renderer.InitializeFonts(modData.Manifest);
 			modData.InitializeLoaders();
 
-
 			PerfHistory.items["render"].hasNormalTick = false;
 			PerfHistory.items["batches"].hasNormalTick = false;
 			PerfHistory.items["render_widgets"].hasNormalTick = false;

OpenRA.Game/Network/OrderManager.cs

@@ -27,7 +27,8 @@ namespace OpenRA.Network
 
 		public readonly string Host;
 		public readonly int Port;
-		public string ServerError;
+
+		public string ServerError = "Server is not responding.";
 
 		public int NetFrameNumber { get; private set; }
 		public int LocalFrameNumber;
@@ -47,7 +48,7 @@ namespace OpenRA.Network
 			if (GameStarted) return;
 
 			NetFrameNumber = 1;
-			for( int i = NetFrameNumber ; i <= FramesAhead ; i++ )
+			for (var i = NetFrameNumber ; i <= FramesAhead ; i++)
 				Connection.Send(i, new List<byte[]>());
 		}
 

OpenRA.Game/Network/UnitOrders.cs

@@ -154,8 +154,10 @@ namespace OpenRA.Network
 					}
 
 				case "ServerError":
+					{
 						orderManager.ServerError = order.TargetString;
 						break;
+					}
 
 				case "SyncInfo":
 					{

OpenRA.Mods.RA/Widgets/Logic/ConnectionLogic.cs

@@ -17,8 +17,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 	public class ConnectionLogic
 	{
 		Action onConnect, onRetry, onAbort;
-		string host;
-		int port;
 
 		void ConnectionStateChanged(OrderManager om)
 		{
@@ -29,14 +27,12 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			}
 			else if (om.Connection.ConnectionState == ConnectionState.NotConnected)
 			{
-				// Show connection failed dialog
 				CloseWindow();
 				Ui.OpenWindow("CONNECTIONFAILED_PANEL", new WidgetArgs()
 				{
+					{ "orderManager", om },
 					{ "onAbort", onAbort },
-					{ "onRetry", onRetry },
-					{ "host", host },
-					{ "port", port }
+					{ "onRetry", onRetry }
 				});
 			}
 		}
@@ -50,8 +46,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 		[ObjectCreator.UseCtor]
 		public ConnectionLogic(Widget widget, string host, int port, Action onConnect, Action onRetry, Action onAbort)
 		{
-			this.host = host;
-			this.port = port;
 			this.onConnect = onConnect;
 			this.onRetry = onRetry;
 			this.onAbort = onAbort;
@@ -82,14 +76,14 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 	public class ConnectionFailedLogic
 	{
 		[ObjectCreator.UseCtor]
-		public ConnectionFailedLogic(Widget widget, string host, int port, Action onRetry, Action onAbort)
+		public ConnectionFailedLogic(Widget widget, OrderManager orderManager, Action onRetry, Action onAbort)
 		{
 			var panel = widget;
 			panel.Get<ButtonWidget>("ABORT_BUTTON").OnClick = () => { Ui.CloseWindow(); onAbort(); };
 			panel.Get<ButtonWidget>("RETRY_BUTTON").OnClick = () => { Ui.CloseWindow(); onRetry(); };
 
 			widget.Get<LabelWidget>("CONNECTING_DESC").GetText = () =>
-				"Could not connect to {0}:{1}".F(host, port);
+				"Could not connect to {0}:{1}\n{2}".F(orderManager.Host, orderManager.Port, orderManager.ServerError);
 		}
 	}
 }

OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs

@@ -63,10 +63,9 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 
 				Ui.OpenWindow("CONNECTIONFAILED_PANEL", new WidgetArgs()
 				{
+					{ "orderManager", om },
 					{ "onAbort", onExit },
-					{ "onRetry", onRetry },
-					{ "host", om.Host },
-					{ "port", om.Port }
+					{ "onRetry", onRetry }
 				});
 			}
 		}