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

Re-enable shellmaps.

Browse Source
This commit is contained in:
Paul Chote
2014-04-13 11:53:09 +12:00
parent e83a21808f
commit fdd4437c52
4 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Graphics/WorldRenderer.cs
View File

@@ -109,9 +109,7 @@ namespace OpenRA.Graphics
{ {
RefreshPalette(); RefreshPalette();
// workaround for #4965 if (world.IsShellmap && !Game.Settings.Game.ShowShellmap)
// if (world.IsShellmap && !Game.Settings.Game.ShowShellmap)
if (world.IsShellmap)
return; return;
var renderables = GenerateRenderables(); var renderables = GenerateRenderables();

4
OpenRA.Game/World.cs
View File

@@ -217,9 +217,7 @@ namespace OpenRA
public void Tick() public void Tick()
{ {
// workaround for #4965 if (!Paused && (!IsShellmap || Game.Settings.Game.ShowShellmap))
// if (!Paused && (!IsShellmap || Game.Settings.Game.ShowShellmap))
if (!Paused && !IsShellmap)
{ {
WorldTick++; WorldTick++;

8
OpenRA.Mods.Cnc/Widgets/Logic/CncMainMenuLogic.cs
View File

@@ -20,15 +20,11 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
: base(widget, world) : base(widget, world)
{ {
var shellmapDecorations = widget.Get("SHELLMAP_DECORATIONS"); var shellmapDecorations = widget.Get("SHELLMAP_DECORATIONS");
// workaround for #4965 shellmapDecorations.IsVisible = () => menuType != MenuType.None && Game.Settings.Game.ShowShellmap;
// shellmapDecorations.IsVisible = () => menuType != MenuType.None && Game.Settings.Game.ShowShellmap;
shellmapDecorations.IsVisible = () => false;
shellmapDecorations.Get<ImageWidget>("RECBLOCK").IsVisible = () => world.WorldTick / 25 % 2 == 0; shellmapDecorations.Get<ImageWidget>("RECBLOCK").IsVisible = () => world.WorldTick / 25 % 2 == 0;
var shellmapDisabledDecorations = widget.Get("SHELLMAP_DISABLED_DECORATIONS"); var shellmapDisabledDecorations = widget.Get("SHELLMAP_DISABLED_DECORATIONS");
// workaround for #4965 shellmapDisabledDecorations.IsVisible = () => !Game.Settings.Game.ShowShellmap;
// shellmapDisabledDecorations.IsVisible = () => !Game.Settings.Game.ShowShellmap;
shellmapDisabledDecorations.IsVisible = () => true;
} }
} }
} }

8
OpenRA.Mods.RA/Widgets/Logic/SettingsLogic.cs
View File

@@ -117,16 +117,10 @@ namespace OpenRA.Mods.RA.Widgets.Logic
BindCheckboxPref(panel, "PIXELDOUBLE_CHECKBOX", ds, "PixelDouble"); BindCheckboxPref(panel, "PIXELDOUBLE_CHECKBOX", ds, "PixelDouble");
BindCheckboxPref(panel, "FRAME_LIMIT_CHECKBOX", ds, "CapFramerate"); BindCheckboxPref(panel, "FRAME_LIMIT_CHECKBOX", ds, "CapFramerate");
// workaround for #4965 BindCheckboxPref(panel, "SHOW_SHELLMAP", gs, "ShowShellmap");
// BindCheckboxPref(panel, "SHOW_SHELLMAP", gs, "ShowShellmap");
BindCheckboxPref(panel, "ALWAYS_SHOW_STATUS_BARS_CHECKBOX", gs, "AlwaysShowStatusBars"); BindCheckboxPref(panel, "ALWAYS_SHOW_STATUS_BARS_CHECKBOX", gs, "AlwaysShowStatusBars");
BindCheckboxPref(panel, "TEAM_HEALTH_COLORS_CHECKBOX", gs, "TeamHealthColors"); BindCheckboxPref(panel, "TEAM_HEALTH_COLORS_CHECKBOX", gs, "TeamHealthColors");
// workaround for #4965
var shellmapCheckbox = panel.Get<CheckboxWidget>("SHOW_SHELLMAP");
shellmapCheckbox.IsDisabled = () => true;
shellmapCheckbox.IsChecked = () => false;
var languageDropDownButton = panel.Get<DropDownButtonWidget>("LANGUAGE_DROPDOWNBUTTON"); var languageDropDownButton = panel.Get<DropDownButtonWidget>("LANGUAGE_DROPDOWNBUTTON");
languageDropDownButton.OnMouseDown = _ => ShowLanguageDropdown(languageDropDownButton); languageDropDownButton.OnMouseDown = _ => ShowLanguageDropdown(languageDropDownButton);
languageDropDownButton.GetText = () => FieldLoader.Translate(ds.Language); languageDropDownButton.GetText = () => FieldLoader.Translate(ds.Language);