From b7b1e13c634c1c2d18a413fcdaf465fc3ece3414 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Thu, 29 Jan 2015 20:26:15 +0100 Subject: [PATCH 1/2] Disable the diplomacy menu in mission or campaign maps --- OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs index 0f1ff1c60b..ba212be7ae 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs @@ -100,7 +100,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic var diplomacy = widget.GetOrNull("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); } From 28b90b01158891d1c287f7ec979c569ae877f254 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Thu, 29 Jan 2015 20:26:40 +0100 Subject: [PATCH 2/2] Use the class enum in LeaveMapLogic.cs as well --- OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs index 961106f6c7..3284b5b16c 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs @@ -86,7 +86,7 @@ namespace OpenRA.Mods.RA.Widgets } var statsButton = dialog.Get("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;