diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs index af25383baa..db2eb75928 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs @@ -102,7 +102,12 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic settingsMenu.Get("BACK_BUTTON").OnClick = () => menuType = MenuType.Main; - rootMenu.Get("RECBLOCK").IsVisible = () => world.FrameNumber / 25 % 2 == 0; + var shellmapDecorations = widget.Get("SHELLMAP_DECORATIONS"); + shellmapDecorations.IsVisible = () => menuType != MenuType.None && Game.Settings.Game.ShowShellmap; + shellmapDecorations.Get("RECBLOCK").IsVisible = () => world.FrameNumber / 25 % 2 == 0; + + var shellmapDisabledDecorations = widget.Get("SHELLMAP_DISABLED_DECORATIONS"); + shellmapDisabledDecorations.IsVisible = () => !Game.Settings.Game.ShowShellmap; } void OpenGamePanel(string id) diff --git a/mods/cnc/chrome/mainmenu.yaml b/mods/cnc/chrome/mainmenu.yaml index f332b690cc..65e542a882 100644 --- a/mods/cnc/chrome/mainmenu.yaml +++ b/mods/cnc/chrome/mainmenu.yaml @@ -3,26 +3,40 @@ Container@MENU_BACKGROUND: Height:WINDOW_BOTTOM Logic:CncMenuLogic Children: - Image@RETICLE: - X:(WINDOW_RIGHT-WIDTH)/2 - Y:(WINDOW_BOTTOM-HEIGHT)/2 - Width:512 - Height:512 - ImageCollection:shellmap - ImageName:reticle - Label@REC: - X:(WINDOW_RIGHT-512)/2+10 - Y:(WINDOW_BOTTOM+512)/2-28 - Height:18 - Font:Bold - Text:REC - Image@RECBLOCK: - X:(WINDOW_RIGHT-512)/2+40 - Y:(WINDOW_BOTTOM+512)/2-25 - Width:16 - Height:16 - ImageCollection:shellmapbits - ImageName:record + Container@SHELLMAP_DECORATIONS: + Children: + Image@RETICLE: + X:(WINDOW_RIGHT-WIDTH)/2 + Y:(WINDOW_BOTTOM-HEIGHT)/2 + Width:512 + Height:512 + ImageCollection:shellmap + ImageName:reticle + Label@REC: + X:(WINDOW_RIGHT-512)/2+10 + Y:(WINDOW_BOTTOM+512)/2-28 + Height:18 + Font:Bold + Text:REC + Image@RECBLOCK: + X:(WINDOW_RIGHT-512)/2+40 + Y:(WINDOW_BOTTOM+512)/2-25 + Width:16 + Height:16 + ImageCollection:shellmapbits + ImageName:record + Container@SHELLMAP_DISABLED_DECORATIONS: + Children: + Image@NOD: + X:WINDOW_RIGHT/2-384 + Y:(WINDOW_BOTTOM-256)/2 + ImageCollection:logos + ImageName:nod-load + Image@GDI: + X:WINDOW_RIGHT/2+128 + Y:(WINDOW_BOTTOM-256)/2 + ImageCollection:logos + ImageName:gdi-load Image@EVA: X:WINDOW_RIGHT-128-43 Y:43