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

Remove "Humans vs Bots" auto-team if bots are disabled. Fixes #4074.

Browse Source
This commit is contained in:
Paul Chote
2013-11-09 16:14:58 +13:00
parent 20f88387b6
commit 727557f50c
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
View File

@@ -227,11 +227,28 @@ namespace OpenRA.Mods.RA.Widgets.Logic
var teamCount = (orderManager.LobbyInfo.Slots.Count(s => !s.Value.LockTeam && orderManager.LobbyInfo.ClientInSlot(s.Key) != null) + 1) / 2; var teamCount = (orderManager.LobbyInfo.Slots.Count(s => !s.Value.LockTeam && orderManager.LobbyInfo.ClientInSlot(s.Key) != null) + 1) / 2;
if (teamCount >= 1) if (teamCount >= 1)
{ {
var teamOptions = Enumerable.Range(0, teamCount + 1).Reverse().Select(d => new DropDownOption var teamOptions = Enumerable.Range(2, teamCount + 1).Reverse().Select(d => new DropDownOption
{ {
Title = (d > 1 ? "{0} Teams".F(d) : d == 1 ? "Humans vs Bots" : "Free for all"), Title = "{0} Teams".F(d),
IsSelected = () => false, IsSelected = () => false,
OnClick = () => orderManager.IssueOrder(Order.Command("assignteams {0}".F(d.ToString()))) OnClick = () => orderManager.IssueOrder(Order.Command("assignteams {0}".F(d.ToString())))
}).ToList();
if (orderManager.LobbyInfo.Slots.Any(s => s.Value.AllowBots))
{
teamOptions.Add(new DropDownOption
{
Title = "Humans vs Bots",
IsSelected = () => false,
OnClick = () => orderManager.IssueOrder(Order.Command("assignteams 1"))
});
}
teamOptions.Add(new DropDownOption
{
Title = "Free for all",
IsSelected = () => false,
OnClick = () => orderManager.IssueOrder(Order.Command("assignteams 0"))
}); });
options.Add("Configure Teams", teamOptions); options.Add("Configure Teams", teamOptions);