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

Merge pull request #12600 from pchote/externalmods

Browse Source 
Add support for switching to mods from other engine installations.
This commit is contained in:
reaperrr
2017-02-12 13:18:53 +01:00
committed by GitHub
parent cdf2a1e87d f2e6601e07
commit 0c44a49722
19 changed files with 443 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
OpenRA.Mods.Common/Widgets/Logic/ConnectionLogic.cs
View File

@@ -10,6 +10,7 @@
#endregion
using System;
using OpenRA.Graphics;
using OpenRA.Network;
using OpenRA.Widgets;
@@ -30,7 +31,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
else if (om.Connection.ConnectionState == ConnectionState.NotConnected)
{
CloseWindow();
Ui.OpenWindow("CONNECTIONFAILED_PANEL", new WidgetArgs()
var switchPanel = om.ServerExternalMod != null ? "CONNECTION_SWITCHMOD_PANEL" : "CONNECTIONFAILED_PANEL";
Ui.OpenWindow(switchPanel, new WidgetArgs()
{
{ "orderManager", om },
{ "onAbort", onAbort },
@@ -146,4 +149,89 @@ namespace OpenRA.Mods.Common.Widgets.Logic
}
}
}
}
public class ConnectionSwitchModLogic : ChromeLogic
{
[ObjectCreator.UseCtor]
public ConnectionSwitchModLogic(Widget widget, OrderManager orderManager, Action onAbort, Action<string> onRetry)
{
var panel = widget;
var abortButton = panel.Get<ButtonWidget>("ABORT_BUTTON");
var switchButton = panel.Get<ButtonWidget>("SWITCH_BUTTON");
var modTitle = orderManager.ServerExternalMod.Title;
var modVersion = orderManager.ServerExternalMod.Version;
var modIcon = orderManager.ServerExternalMod.Icon;
switchButton.OnClick = () =>
{
var launchCommand = "Launch.Connect=" + orderManager.Host + ":" + orderManager.Port;
Game.SwitchToExternalMod(orderManager.ServerExternalMod, new[] { launchCommand }, () =>
{
orderManager.ServerError = "Failed to switch mod.";
Ui.CloseWindow();
Ui.OpenWindow("CONNECTIONFAILED_PANEL", new WidgetArgs()
{
{ "orderManager", orderManager },
{ "onAbort", onAbort },
{ "onRetry", onRetry }
});
});
};
abortButton.Visible = onAbort != null;
abortButton.OnClick = () => { Ui.CloseWindow(); onAbort(); };
var width = 0;
var title = panel.GetOrNull<LabelWidget>("MOD_TITLE");
if (title != null)
{
var font = Game.Renderer.Fonts[title.Font];
var label = WidgetUtils.TruncateText(modTitle, title.Bounds.Width, font);
var labelWidth = font.Measure(label).X;
width = Math.Max(width, title.Bounds.X + labelWidth);
title.Bounds.Width = labelWidth;
title.GetText = () => label;
}
var version = panel.GetOrNull<LabelWidget>("MOD_VERSION");
if (version != null)
{
var font = Game.Renderer.Fonts[version.Font];
var label = WidgetUtils.TruncateText(modVersion, version.Bounds.Width, font);
var labelWidth = font.Measure(label).X;
width = Math.Max(width, version.Bounds.X + labelWidth);
version.Bounds.Width = labelWidth;
version.GetText = () => label;
}
var logo = panel.GetOrNull<RGBASpriteWidget>("MOD_ICON");
if (logo != null && modIcon != null)
logo.GetSprite = () => modIcon;
if (logo != null && modIcon == null)
{
// Hide the logo and center just the text
if (title != null)
title.Bounds.Offset(logo.Bounds.Left - title.Bounds.Left, 0);
if (version != null)
version.Bounds.Offset(logo.Bounds.Left - version.Bounds.Left, 0);
width -= logo.Bounds.Width;
}
else
{
// Add an equal logo margin on the right of the text
width += logo.Bounds.Width;
}
var container = panel.GetOrNull("MOD_CONTAINER");
if (container != null)
{
container.Bounds.Offset((container.Bounds.Width - width) / 2, 0);
container.Bounds.Width = width;
}
}
}
}

3
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs
View File

@@ -91,7 +91,8 @@ 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 ? "CONNECTION_SWITCHMOD_PANEL" : "CONNECTIONFAILED_PANEL";
Ui.OpenWindow(switchPanel, new WidgetArgs()
{
{ "orderManager", om },
{ "onAbort", onExit },