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

Fix some uses of Exts.IsTraitEnabled.

Browse Source
This commit is contained in:
RoosterDragon
2017-12-07 20:43:23 +00:00
committed by abcdefg30
parent 9241c0f8b7
commit 70ffa99203
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Widgets/Logic/Ingame/CommandBarLogic.cs
View File

@@ -155,7 +155,7 @@ namespace OpenRA.Mods.Common.Widgets
{ {
BindButtonIcon(deployButton); BindButtonIcon(deployButton);
deployButton.IsDisabled = () => { UpdateStateIfNecessary(); return !selectedDeploys.Any(Exts.IsTraitEnabled); }; deployButton.IsDisabled = () => { UpdateStateIfNecessary(); return !selectedDeploys.Any(pair => pair.Trait.IsTraitEnabled()); };
deployButton.IsHighlighted = () => deployHighlighted > 0; deployButton.IsHighlighted = () => deployHighlighted > 0;
deployButton.OnClick = () => deployButton.OnClick = () =>
{ {
@@ -307,7 +307,7 @@ namespace OpenRA.Mods.Common.Widgets
UpdateStateIfNecessary(); UpdateStateIfNecessary();
var orders = selectedDeploys var orders = selectedDeploys
.Where(Exts.IsTraitEnabled) .Where(pair => pair.Trait.IsTraitEnabled())
.Select(d => d.Trait.IssueDeployOrder(d.Actor)) .Select(d => d.Trait.IssueDeployOrder(d.Actor))
.ToArray(); .ToArray();