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

Merge pull request #11637 from abcdefg30/noMove

Browse Source 
Fix the attack-move cursor appearing for units which can't attack-move
This commit is contained in:
Paul Chote
2016-09-04 11:06:58 +01:00
committed by GitHub
parent 85ab797705 ba9fff3c6d
commit 48c9e74bb4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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