diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs index 65324903eb..6a9601ee09 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs @@ -266,20 +266,20 @@ namespace OpenRA.Mods.RA.Widgets.Logic var c = orderManager.LobbyInfo.ClientInSlot(kv.Key); Widget template; - if (c == null || (c.Bot != null && Game.IsHost == false)) + if (c == null) { if (Game.IsHost) { template = EmptySlotTemplateHost.Clone(); var name = template.GetWidget("NAME"); - name.GetText = () => s.Closed ? "Closed" : (c == null) ? "Open" : c.Bot; + name.GetText = () => s.Closed ? "Closed" : "Open"; name.OnMouseDown = _ => LobbyUtils.ShowSlotDropDown(name, s, c, orderManager); } else { template = EmptySlotTemplate.Clone(); var name = template.GetWidget("NAME"); - name.GetText = () => s.Closed ? "Closed" : (c == null) ? "Open" : c.Bot; + name.GetText = () => s.Closed ? "Closed" : "Open"; } var join = template.GetWidget("JOIN"); @@ -288,8 +288,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic join.OnClick = () => orderManager.IssueOrder(Order.Command("slot " + s.PlayerReference)); join.IsVisible = () => !s.Closed && c == null && orderManager.LocalClient.State != Session.ClientState.Ready; } - - template.GetWidget("BOT").IsVisible = () => c != null; } else if ((c.Index == orderManager.LocalClient.Index && c.State != Session.ClientState.Ready) || (c.Bot != null && Game.IsHost)) @@ -338,8 +336,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic var status = template.GetWidget("STATUS"); status.IsChecked = () => c.State == Session.ClientState.Ready; status.OnClick = CycleReady; - if (c.Bot != null) status.IsVisible = () => false; - + status.IsVisible = () => c.Bot == null; } else { @@ -362,6 +359,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic status.IsChecked = () => c.State == Session.ClientState.Ready; if (c.Index == orderManager.LocalClient.Index) status.OnClick = CycleReady; + status.IsVisible = () => c.Bot == null; var kickButton = template.GetWidget("KICK"); kickButton.IsVisible = () => Game.IsHost && c.Index != orderManager.LocalClient.Index; diff --git a/mods/ra/chrome/lobby.yaml b/mods/ra/chrome/lobby.yaml index b6ad48f846..128737c419 100644 --- a/mods/ra/chrome/lobby.yaml +++ b/mods/ra/chrome/lobby.yaml @@ -190,15 +190,6 @@ Background@SERVER_LOBBY: Height:25 X:160 Y:0 - Label@BOT: - Id:BOT - Text:Bot - Width:278 - Height:25 - X:160 - Y:0 - Align:Center - Font:Bold Container@TEMPLATE_EMPTY_HOST: Id:TEMPLATE_EMPTY_HOST X:5 @@ -221,15 +212,6 @@ Background@SERVER_LOBBY: Height:25 X:160 Y:0 - Label@BOT: - Id:BOT - Text:Bot - Width:278 - Height:25 - X:160 - Y:0 - Align:Center - Font:Bold Container@TEMPLATE_LOCAL_SPECTATOR: Id:TEMPLATE_LOCAL_SPECTATOR X:5