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

Move the checks into the Any to prevent units in a group from doing nothing

Browse Source
This commit is contained in:
abcdefg30
2016-07-12 19:15:04 +02:00
parent 756dc7c127
commit ba9fff3c6d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Widgets/WorldCommandWidget.cs
View File

@@ -100,10 +100,10 @@ namespace OpenRA.Mods.Common.Widgets
bool PerformAttackMove() bool PerformAttackMove()
{ {
var actors = world.Selection.Actors var actors = world.Selection.Actors
.Where(a => a.Owner == world.LocalPlayer && a.Info.HasTraitInfo<AttackMoveInfo>() && a.Info.HasTraitInfo<AutoTargetInfo>()) .Where(a => a.Owner == world.LocalPlayer)
.ToArray(); .ToArray();
if (actors.Any()) if (actors.Any(a => a.Info.HasTraitInfo<AttackMoveInfo>() && a.Info.HasTraitInfo<AutoTargetInfo>()))
world.OrderGenerator = new GenericSelectTarget(actors, world.OrderGenerator = new GenericSelectTarget(actors,
"AttackMove", "attackmove", Game.Settings.Game.MouseButtonPreference.Action); "AttackMove", "attackmove", Game.Settings.Game.MouseButtonPreference.Action);
@@ -183,9 +183,9 @@ namespace OpenRA.Mods.Common.Widgets
bool PerformGuard() bool PerformGuard()
{ {
var actors = world.Selection.Actors var actors = world.Selection.Actors
.Where(a => !a.Disposed && a.Owner == world.LocalPlayer && a.Info.HasTraitInfo<GuardInfo>() && a.Info.HasTraitInfo<AutoTargetInfo>()); .Where(a => !a.Disposed && a.Owner == world.LocalPlayer);
if (actors.Any()) if (actors.Any(a => a.Info.HasTraitInfo<GuardInfo>() && a.Info.HasTraitInfo<AutoTargetInfo>()))
world.OrderGenerator = new GuardOrderGenerator(actors, world.OrderGenerator = new GuardOrderGenerator(actors,
"Guard", "guard", Game.Settings.Game.MouseButtonPreference.Action); "Guard", "guard", Game.Settings.Game.MouseButtonPreference.Action);