From 08999164067f87b0c669d9f45a97a408d0929ff3 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 19 Jun 2011 12:30:58 +1200 Subject: [PATCH] Disable diplomacy and cheats for observers --- OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs index e8c7a33b1d..0b4900ad43 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs @@ -49,7 +49,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic widget.GetWidget("PLAYER_WIDGETS").IsVisible = () => true; var diplomacyButton = ingameRoot.GetWidget("DIPLOMACY_BUTTON"); - var diplomacyAvailable = world.Players.Any(a => a != world.LocalPlayer && !a.NonCombatant); + var diplomacyAvailable = world.LocalPlayer != null && world.Players.Any(a => a != world.LocalPlayer && !a.NonCombatant); diplomacyButton.IsDisabled = () => !diplomacyAvailable; diplomacyButton.OnClick = () => { @@ -84,8 +84,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic menu = MenuType.Diplomacy; Game.OpenWindow("CHEATS_PANEL", new WidgetArgs() {{"onExit", () => menu = MenuType.None }}); }; - - cheatsButton.IsVisible = () => world.LobbyInfo.GlobalSettings.AllowCheats; + cheatsButton.IsVisible = () => world.LocalPlayer != null && world.LobbyInfo.GlobalSettings.AllowCheats; var postgameBG = ingameRoot.GetWidget("POSTGAME_BG"); postgameBG.IsVisible = () =>