From 4d71e37ab0a91877483346b655c5c64a75c04d3a Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Wed, 2 Apr 2014 22:46:59 +0200 Subject: [PATCH] Disable shellmaps temporarily --- OpenRA.Game/Graphics/WorldRenderer.cs | 4 +++- OpenRA.Game/World.cs | 4 +++- OpenRA.Mods.Cnc/Widgets/Logic/CncMainMenuLogic.cs | 8 ++++++-- OpenRA.Mods.RA/Widgets/Logic/SettingsLogic.cs | 8 +++++++- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/OpenRA.Game/Graphics/WorldRenderer.cs b/OpenRA.Game/Graphics/WorldRenderer.cs index 3af9019b68..22cbf4f597 100644 --- a/OpenRA.Game/Graphics/WorldRenderer.cs +++ b/OpenRA.Game/Graphics/WorldRenderer.cs @@ -108,7 +108,9 @@ namespace OpenRA.Graphics { RefreshPalette(); - if (world.IsShellmap && !Game.Settings.Game.ShowShellmap) + // workaround for #4965 + // if (world.IsShellmap && !Game.Settings.Game.ShowShellmap) + if (world.IsShellmap) return; var renderables = GenerateRenderables(); diff --git a/OpenRA.Game/World.cs b/OpenRA.Game/World.cs index 8aca6522a3..79f8da42c0 100644 --- a/OpenRA.Game/World.cs +++ b/OpenRA.Game/World.cs @@ -213,7 +213,9 @@ namespace OpenRA public void Tick() { - if (!Paused && (!IsShellmap || Game.Settings.Game.ShowShellmap)) + // workaround for #4965 + // if (!Paused && (!IsShellmap || Game.Settings.Game.ShowShellmap)) + if (!Paused && !IsShellmap) { WorldTick++; diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncMainMenuLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncMainMenuLogic.cs index 266515e2b6..4128db5be0 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncMainMenuLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncMainMenuLogic.cs @@ -20,11 +20,15 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic : base(widget, world) { var shellmapDecorations = widget.Get("SHELLMAP_DECORATIONS"); - shellmapDecorations.IsVisible = () => menuType != MenuType.None && Game.Settings.Game.ShowShellmap; + // workaround for #4965 + // shellmapDecorations.IsVisible = () => menuType != MenuType.None && Game.Settings.Game.ShowShellmap; + shellmapDecorations.IsVisible = () => false; shellmapDecorations.Get("RECBLOCK").IsVisible = () => world.WorldTick / 25 % 2 == 0; var shellmapDisabledDecorations = widget.Get("SHELLMAP_DISABLED_DECORATIONS"); - shellmapDisabledDecorations.IsVisible = () => !Game.Settings.Game.ShowShellmap; + // workaround for #4965 + // shellmapDisabledDecorations.IsVisible = () => !Game.Settings.Game.ShowShellmap; + shellmapDisabledDecorations.IsVisible = () => true; } } } diff --git a/OpenRA.Mods.RA/Widgets/Logic/SettingsLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/SettingsLogic.cs index ad4fb07e4c..739bb47782 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/SettingsLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/SettingsLogic.cs @@ -119,10 +119,16 @@ namespace OpenRA.Mods.RA.Widgets.Logic BindCheckboxPref(panel, "PIXELDOUBLE_CHECKBOX", ds, "PixelDouble"); BindCheckboxPref(panel, "FRAME_LIMIT_CHECKBOX", ds, "CapFramerate"); - BindCheckboxPref(panel, "SHOW_SHELLMAP", gs, "ShowShellmap"); + // workaround for #4965 + // BindCheckboxPref(panel, "SHOW_SHELLMAP", gs, "ShowShellmap"); BindCheckboxPref(panel, "ALWAYS_SHOW_STATUS_BARS_CHECKBOX", gs, "AlwaysShowStatusBars"); BindCheckboxPref(panel, "TEAM_HEALTH_COLORS_CHECKBOX", gs, "TeamHealthColors"); + // workaround for #4965 + var shellmapCheckbox = panel.Get("SHOW_SHELLMAP"); + shellmapCheckbox.IsDisabled = () => true; + shellmapCheckbox.IsChecked = () => false; + var languageDropDownButton = panel.Get("LANGUAGE_DROPDOWNBUTTON"); languageDropDownButton.OnMouseDown = _ => ShowLanguageDropdown(languageDropDownButton); languageDropDownButton.GetText = () => FieldLoader.Translate(ds.Language);