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

fix foreach/closure bugs in CncLobbyLogic when setting up spectators

Browse Source
This commit is contained in:
Chris Forbes
2011-07-17 12:15:20 +12:00
parent c05215c477
commit af05856a5f
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OpenRA.Mods.Cnc/Widgets/Logic/CncLobbyLogic.cs
View File

@@ -560,22 +560,23 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
foreach (var client in orderManager.LobbyInfo.Clients.Where(client => client.Slot == null)) foreach (var client in orderManager.LobbyInfo.Clients.Where(client => client.Slot == null))
{ {
Widget template; Widget template;
var ready = client.State == Session.ClientState.Ready; var c = client;
var ready = c.State == Session.ClientState.Ready;
// Editable spectator // Editable spectator
if (client.Index == orderManager.LocalClient.Index) if (c.Index == orderManager.LocalClient.Index)
{ {
template = EditableSpectatorTemplate.Clone(); template = EditableSpectatorTemplate.Clone();
var name = template.GetWidget<TextFieldWidget>("NAME"); var name = template.GetWidget<TextFieldWidget>("NAME");
name.IsDisabled = () => ready; name.IsDisabled = () => ready;
name.Text = client.Name; name.Text = c.Name;
name.OnEnterKey = () => name.OnEnterKey = () =>
{ {
name.Text = name.Text.Trim(); name.Text = name.Text.Trim();
if (name.Text.Length == 0) if (name.Text.Length == 0)
name.Text = client.Name; name.Text = c.Name;
name.LoseFocus(); name.LoseFocus();
if (name.Text == client.Name) if (name.Text == c.Name)
return true; return true;
orderManager.IssueOrder(Order.Command("name " + name.Text)); orderManager.IssueOrder(Order.Command("name " + name.Text));
@@ -587,10 +588,10 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
var color = template.GetWidget<DropDownButtonWidget>("COLOR"); var color = template.GetWidget<DropDownButtonWidget>("COLOR");
color.IsDisabled = () => ready; color.IsDisabled = () => ready;
color.OnMouseDown = _ => ShowColorDropDown(color, client); color.OnMouseDown = _ => ShowColorDropDown(color, c);
var colorBlock = color.GetWidget<ColorBlockWidget>("COLORBLOCK"); var colorBlock = color.GetWidget<ColorBlockWidget>("COLORBLOCK");
colorBlock.GetColor = () => client.ColorRamp.GetColor(0); colorBlock.GetColor = () => c.ColorRamp.GetColor(0);
var status = template.GetWidget<CheckboxWidget>("STATUS_CHECKBOX"); var status = template.GetWidget<CheckboxWidget>("STATUS_CHECKBOX");
status.IsChecked = () => ready; status.IsChecked = () => ready;
@@ -600,17 +601,17 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
else else
{ {
template = NonEditableSpectatorTemplate.Clone(); template = NonEditableSpectatorTemplate.Clone();
template.GetWidget<LabelWidget>("NAME").GetText = () => client.Name; template.GetWidget<LabelWidget>("NAME").GetText = () => c.Name;
var color = template.GetWidget<ColorBlockWidget>("COLOR"); var color = template.GetWidget<ColorBlockWidget>("COLOR");
color.GetColor = () => client.ColorRamp.GetColor(0); color.GetColor = () => c.ColorRamp.GetColor(0);
template.GetWidget<ImageWidget>("STATUS_IMAGE").IsVisible = () => template.GetWidget<ImageWidget>("STATUS_IMAGE").IsVisible = () =>
client.Bot != null || client.State == Session.ClientState.Ready; c.Bot != null || c.State == Session.ClientState.Ready;
var kickButton = template.GetWidget<ButtonWidget>("KICK"); var kickButton = template.GetWidget<ButtonWidget>("KICK");
kickButton.IsVisible = () => Game.IsHost && client.Index != orderManager.LocalClient.Index; kickButton.IsVisible = () => Game.IsHost && c.Index != orderManager.LocalClient.Index;
kickButton.IsDisabled = () => orderManager.LocalClient.State == Session.ClientState.Ready; kickButton.IsDisabled = () => orderManager.LocalClient.State == Session.ClientState.Ready;
kickButton.OnClick = () => orderManager.IssueOrder(Order.Command("kick " + client.Index)); kickButton.OnClick = () => orderManager.IssueOrder(Order.Command("kick " + c.Index));
} }
template.IsVisible = () => true; template.IsVisible = () => true;