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

Disable the button/order when there aren't enough clients to assign

Browse Source
This commit is contained in:
Scott_NZ
2013-03-11 00:29:23 +13:00
parent 8c46b421de
commit 7af91f1747
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.RA/ServerTraits/LobbyCommands.cs
View File

@@ -333,15 +333,18 @@ namespace OpenRA.Mods.RA.Server
server.SendChatTo(conn, "Number of teams could not be parsed: {0}".F(s)); server.SendChatTo(conn, "Number of teams could not be parsed: {0}".F(s));
return true; return true;
} }
teams = teams.Clamp(2, 8); teams = teams.Clamp(2, 8);
var clients = server.lobbyInfo.Slots var clients = server.lobbyInfo.Slots
.Select(slot => server.lobbyInfo.Clients.SingleOrDefault(c => c.Slot == slot.Key)) .Select(slot => server.lobbyInfo.Clients.SingleOrDefault(c => c.Slot == slot.Key))
.Where(c => c != null && !server.lobbyInfo.Slots[c.Slot].LockTeam).ToArray(); .Where(c => c != null && !server.lobbyInfo.Slots[c.Slot].LockTeam).ToArray();
if (clients.Length < 2)
{
server.SendChatTo(conn, "Not enough clients to assign teams");
return true;
}
var teamSizes = new int[clients.Length]; var teamSizes = new int[clients.Length];
for (var i = 0; i < clients.Length; i++) for (var i = 0; i < clients.Length; i++)
teamSizes[i % teams]++; teamSizes[i % teams]++;

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

@@ -163,7 +163,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic
if (assignTeams != null) if (assignTeams != null)
{ {
assignTeams.IsVisible = () => Game.IsHost; assignTeams.IsVisible = () => Game.IsHost;
assignTeams.IsDisabled = () => gameStarting || orderManager.LocalClient == null || orderManager.LocalClient.IsReady; assignTeams.IsDisabled = () => gameStarting || orderManager.LobbyInfo.Clients.Count < 2
|| orderManager.LocalClient == null || orderManager.LocalClient.IsReady;
assignTeams.OnMouseDown = _ => assignTeams.OnMouseDown = _ =>
{ {