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

Disable the attack-move and guard cursor for units which can't auto-target

Browse Source
This commit is contained in:
abcdefg30
2016-07-12 19:08:31 +02:00
parent fb47c3ac9e
commit 756dc7c127
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/WorldCommandWidget.cs
View File

@@ -100,7 +100,7 @@ namespace OpenRA.Mods.Common.Widgets
bool PerformAttackMove()
{
var actors = world.Selection.Actors
.Where(a => a.Owner == world.LocalPlayer && a.Info.HasTraitInfo<AttackMoveInfo>())
.Where(a => a.Owner == world.LocalPlayer && a.Info.HasTraitInfo<AttackMoveInfo>() && a.Info.HasTraitInfo<AutoTargetInfo>())
.ToArray();
if (actors.Any())
@@ -183,7 +183,7 @@ 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 && a.Info.HasTraitInfo<GuardInfo>() && a.Info.HasTraitInfo<AutoTargetInfo>());
if (actors.Any())
world.OrderGenerator = new GuardOrderGenerator(actors,