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

fix crash in ObserverShroudSelectorLogic if two players have the same name

Browse Source
This commit is contained in:
Chris Forbes
2013-04-12 21:04:19 +12:00
parent b649b4b7bb
commit 829af80c95
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenRA.Mods.RA/Widgets/Logic/ObserverShroudSelectorLogic.cs
View File

@@ -35,21 +35,22 @@ namespace OpenRA.Mods.RA.Widgets.Logic
} }
} }
static string LabelForPlayer(Player p)
{
return p != null ? "{0}'s view".F(p.PlayerName) : "World view";
}
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
public ObserverShroudSelectorLogic(Widget widget, World world) public ObserverShroudSelectorLogic(Widget widget, World world)
{ {
var views = world.Players.Where(p => !p.NonCombatant).ToDictionary(p => p.PlayerName, var views = world.Players.Where(p => !p.NonCombatant).Concat(new[] { (Player)null }).Select(
p => new CameraOption("{0}'s view".F(p.PlayerName), p => new CameraOption(LabelForPlayer(p),
() => world.RenderPlayer == p, () => world.RenderPlayer == p,
() => world.RenderPlayer = p () => world.RenderPlayer = p
)); )).ToArray();
views.Add("", new CameraOption("World view",
() => world.RenderPlayer == null,
() => world.RenderPlayer = null
));
var shroudSelector = widget.Get<DropDownButtonWidget>("SHROUD_SELECTOR"); var shroudSelector = widget.Get<DropDownButtonWidget>("SHROUD_SELECTOR");
shroudSelector.GetText = () => views[world.RenderPlayer == null ? "" : world.RenderPlayer.PlayerName].Label; shroudSelector.GetText = () => LabelForPlayer(world.RenderPlayer);
shroudSelector.OnMouseDown = _ => shroudSelector.OnMouseDown = _ =>
{ {
Func<CameraOption, ScrollItemWidget, ScrollItemWidget> setupItem = (option, template) => Func<CameraOption, ScrollItemWidget, ScrollItemWidget> setupItem = (option, template) =>
@@ -58,7 +59,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
item.Get<LabelWidget>("LABEL").GetText = () => option.Label; item.Get<LabelWidget>("LABEL").GetText = () => option.Label;
return item; return item;
}; };
shroudSelector.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", views.Count() * 30, views.Values, setupItem); shroudSelector.ShowDropDown("LABEL_DROPDOWN_TEMPLATE", views.Length * 30, views, setupItem);
}; };
} }
} }