diff --git a/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs b/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs index ffa18b3719..ae52062330 100644 --- a/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs +++ b/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs @@ -440,8 +440,8 @@ namespace OpenRA.Mods.Common.Server bool.TryParse(s, out server.LobbyInfo.GlobalSettings.Shroud); server.SyncLobbyGlobalSettings(); - server.SendMessage("{0} {1} Shroud." - .F(client.Name, server.LobbyInfo.GlobalSettings.Shroud ? "enabled" : "disabled")); + server.SendMessage("{0} {1} Explored map." + .F(client.Name, server.LobbyInfo.GlobalSettings.Shroud ? "disabled" : "enabled")); return true; } diff --git a/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs b/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs index 31c52a2278..c9fc5f1ed2 100644 --- a/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs +++ b/OpenRA.Mods.Common/ServerTraits/LobbySettingsNotification.cs @@ -32,7 +32,7 @@ namespace OpenRA.Mods.Common.Server server.SendOrderTo(conn, "Message", "Allow Cheats: {0}".F(server.LobbyInfo.GlobalSettings.AllowCheats)); if (server.LobbyInfo.GlobalSettings.Shroud != defaults.Shroud) - server.SendOrderTo(conn, "Message", "Shroud: {0}".F(server.LobbyInfo.GlobalSettings.Shroud)); + server.SendOrderTo(conn, "Message", "Explored map: {0}".F(!server.LobbyInfo.GlobalSettings.Shroud)); if (server.LobbyInfo.GlobalSettings.Fog != defaults.Fog) server.SendOrderTo(conn, "Message", "Fog of war: {0}".F(server.LobbyInfo.GlobalSettings.Fog)); diff --git a/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs index 0052a8a805..08986f28cc 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs @@ -497,12 +497,12 @@ namespace OpenRA.Mods.Common.Widgets.Logic }; } - var enableShroud = optionsBin.GetOrNull("SHROUD_CHECKBOX"); - if (enableShroud != null) + var exploredMap = optionsBin.GetOrNull("EXPLORED_MAP_CHECKBOX"); + if (exploredMap != null) { - enableShroud.IsChecked = () => orderManager.LobbyInfo.GlobalSettings.Shroud; - enableShroud.IsDisabled = () => Map.Status != MapStatus.Available || Map.Map.Options.Shroud.HasValue || configurationDisabled(); - enableShroud.OnClick = () => orderManager.IssueOrder(Order.Command( + exploredMap.IsChecked = () => !orderManager.LobbyInfo.GlobalSettings.Shroud; + exploredMap.IsDisabled = () => Map.Status != MapStatus.Available || Map.Map.Options.Shroud.HasValue || configurationDisabled(); + exploredMap.OnClick = () => orderManager.IssueOrder(Order.Command( "shroud {0}".F(!orderManager.LobbyInfo.GlobalSettings.Shroud))); } diff --git a/mods/cnc/chrome/lobby-dialogs.yaml b/mods/cnc/chrome/lobby-dialogs.yaml index 33d45f4863..2028a32b0b 100644 --- a/mods/cnc/chrome/lobby-dialogs.yaml +++ b/mods/cnc/chrome/lobby-dialogs.yaml @@ -110,11 +110,11 @@ Background@LOBBY_OPTIONS_BIN: Width: PARENT_RIGHT-60 Height: PARENT_BOTTOM-75 Children: - Checkbox@SHROUD_CHECKBOX: + Checkbox@EXPLORED_MAP_CHECKBOX: Width: 230 Height: 20 Font: Regular - Text: Shroud + Text: Explored map Checkbox@FOG_CHECKBOX: Y: 35 Width: 230 diff --git a/mods/d2k/chrome/lobby-dialogs.yaml b/mods/d2k/chrome/lobby-dialogs.yaml index 4a5c12497d..095000caa9 100644 --- a/mods/d2k/chrome/lobby-dialogs.yaml +++ b/mods/d2k/chrome/lobby-dialogs.yaml @@ -109,10 +109,10 @@ Background@LOBBY_OPTIONS_BIN: Width: PARENT_RIGHT-60 Height: PARENT_BOTTOM-75 Children: - Checkbox@SHROUD_CHECKBOX: + Checkbox@EXPLORED_MAP_CHECKBOX: Width: 140 Height: 20 - Text: Shroud + Text: Explored map Checkbox@FOG_CHECKBOX: Y: 35 Width: 140 diff --git a/mods/ra/chrome/lobby-dialogs.yaml b/mods/ra/chrome/lobby-dialogs.yaml index a3438f6114..294444c495 100644 --- a/mods/ra/chrome/lobby-dialogs.yaml +++ b/mods/ra/chrome/lobby-dialogs.yaml @@ -109,10 +109,10 @@ Background@LOBBY_OPTIONS_BIN: Width: PARENT_RIGHT-60 Height: PARENT_BOTTOM-75 Children: - Checkbox@SHROUD_CHECKBOX: + Checkbox@EXPLORED_MAP_CHECKBOX: Width: 140 Height: 20 - Text: Shroud + Text: Explored map Checkbox@FOG_CHECKBOX: Y: 35 Width: 140