Merge pull request #7392 from abcdefg30/missiondiplomacy

Disable the diplomacy menu in mission or campaign maps
This commit is contained in:
Matthias Mailänder
2015-01-31 10:49:44 +01:00
2 changed files with 2 additions and 2 deletions

View File

@@ -86,7 +86,7 @@ namespace OpenRA.Mods.RA.Widgets
}
var statsButton = dialog.Get<ButtonWidget>("STATS_BUTTON");
statsButton.IsVisible = () => !(world.Map.Type == "Mission" || world.Map.Type == "Campaign") || world.IsReplay;
statsButton.IsVisible = () => !world.Map.Visibility.HasFlag(MapVisibility.MissionSelector) || world.IsReplay;
statsButton.OnClick = () =>
{
showStats = true;

View File

@@ -100,7 +100,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
var diplomacy = widget.GetOrNull<MenuButtonWidget>("DIPLOMACY_BUTTON");
if (diplomacy != null)
{
diplomacy.Visible = world.Players.Any(a => a != world.LocalPlayer && !a.NonCombatant);
diplomacy.Visible = !world.Map.Visibility.HasFlag(MapVisibility.MissionSelector) && world.Players.Any(a => a != world.LocalPlayer && !a.NonCombatant);
diplomacy.IsDisabled = () => disableSystemButtons;
diplomacy.OnClick = () => OpenMenuPanel(diplomacy);
}