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

Merge pull request #8731 from deniz1a/simplify-lobby-logic

Browse Source 
Simplifies Start button logic in lobby
This commit is contained in:
abcdefg30
2015-08-24 21:27:05 +02:00
parent 18b8eb30a3 f2ac6c9980
commit 67966ad704
4 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs
View File

@@ -297,15 +297,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
orderManager.LobbyInfo.Slots.Any(sl => sl.Value.Required && orderManager.LobbyInfo.ClientInSlot(sl.Key) == null); orderManager.LobbyInfo.Slots.Any(sl => sl.Value.Required && orderManager.LobbyInfo.ClientInSlot(sl.Key) == null);
startGameButton.OnClick = () => startGameButton.OnClick = () =>
{ {
Func<KeyValuePair<string, Session.Slot>, bool> notReady = sl =>
{
var cl = orderManager.LobbyInfo.ClientInSlot(sl.Key);
// Bots and admins don't count // Bots and admins don't count
return cl != null && !cl.IsAdmin && cl.Bot == null && !cl.IsReady; if (orderManager.LobbyInfo.Clients.Any(c => c.Slot != null && !c.IsAdmin && c.Bot == null && !c.IsReady))
};
if (orderManager.LobbyInfo.Slots.Any(notReady))
panel = PanelType.ForceStart; panel = PanelType.ForceStart;
else else
startGame(); startGame();

4
mods/cnc/chrome/lobby-playerbin.yaml
View File

@@ -259,7 +259,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
MaxLength: 16 MaxLength: 16
Label@SPECTATOR: Label@SPECTATOR:
Text: Spectator Text: Spectator
Width: 315-55+55 Width: 315
Height: 25 Height: 25
X: 210 X: 210
Y: 0 Y: 0
@@ -309,7 +309,7 @@ ScrollPanel@LOBBY_PLAYER_BIN:
Font: Bold Font: Bold
Label@SPECTATOR: Label@SPECTATOR:
Text: Spectator Text: Spectator
Width: 315-55+55 Width: 315
Height: 25 Height: 25
X: 210 X: 210
Y: 0 Y: 0

1
mods/d2k/chrome/lobby-playerbin.yaml
View File

@@ -96,7 +96,6 @@ ScrollPanel@LOBBY_PLAYER_BIN:
Height: 20 Height: 20
Visible: false Visible: false
Image@STATUS_IMAGE: Image@STATUS_IMAGE:
Visible: false
X: 537 X: 537
Y: 4 Y: 4
Width: 20 Width: 20

1
mods/ra/chrome/lobby-playerbin.yaml
View File

@@ -96,7 +96,6 @@ ScrollPanel@LOBBY_PLAYER_BIN:
Height: 20 Height: 20
Visible: false Visible: false
Image@STATUS_IMAGE: Image@STATUS_IMAGE:
Visible: false
X: 537 X: 537
Y: 4 Y: 4
Width: 20 Width: 20