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

Remove inconsistencies w.r.t the Surrender order

Browse Source 
* Surrendering is now possible even in maps that do not use
  ConquestVictoryConditions.
* The Surrender button is greyed out instead of hidden when it cannot be
  used.
This commit is contained in:
Oliver Brakmann
2014-08-04 00:34:38 +02:00
parent dc33e0e1b0
commit d673520d82
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.RA/Widgets/Logic/IngameMenuLogic.cs
View File

@@ -85,7 +85,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
hideMenu = true;
ConfirmationDialogs.PromptConfirmAction("Surrender", "Are you sure you want to surrender?", onSurrender, showMenu);
};
widget.Get("SURRENDER").IsVisible = () => world.LocalPlayer != null && world.LocalPlayer.WinState == WinState.Undefined;
surrenderButton.IsDisabled = () => world.LocalPlayer == null || world.LocalPlayer.WinState != WinState.Undefined;
menu.Get<ButtonWidget>("MUSIC").OnClick = () =>
{
@@ -97,7 +97,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic
});
};
menu.Get<ButtonWidget>("SETTINGS").OnClick = () =>
var settingsButton = widget.Get<ButtonWidget>("SETTINGS");
settingsButton.OnClick = () =>
{
hideMenu = true;
Ui.OpenWindow("SETTINGS_PANEL", new WidgetArgs()