Implement new server-connection mod switching logic.

2017-01-20 20:29:51 +00:00
parent 4d982f00e4
commit 2da4e87b94
7 changed files with 292 additions and 15 deletions
--- a/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs
@@ -91,7 +91,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic

 				Action<string> onRetry = password => ConnectionLogic.Connect(om.Host, om.Port, password, onConnect, onExit);

-				Ui.OpenWindow("CONNECTIONFAILED_PANEL", new WidgetArgs()
+				var switchPanel = (om.ServerExternalMod != null || om.ServerMod != null) ?
+					"CONNECTION_SWITCHMOD_PANEL" : "CONNECTIONFAILED_PANEL";
+				Ui.OpenWindow(switchPanel, new WidgetArgs()
 				{
 					{ "orderManager", om },
 					{ "onAbort", onExit },