Merge pull request #10018 from pchote/fix-spy-cursor

Restore targeting cursor when mousing over a disguised enemy spy.
This commit is contained in:
Oliver Brakmann
2015-11-21 20:57:12 +01:00
11 changed files with 21 additions and 13 deletions

View File

@@ -199,7 +199,7 @@ namespace OpenRA.Mods.RA.Traits
public int OrderPriority { get { return 5; } }
public bool OverrideSelection { get { return true; } }
public bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, TargetModifiers modifiers, ref string cursor)
public bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, ref TargetModifiers modifiers, ref string cursor)
{
if (target.Type != TargetType.Terrain)
return false;

View File

@@ -120,7 +120,7 @@ namespace OpenRA.Mods.RA.Traits
public bool IsQueued { get; protected set; }
public bool OverrideSelection { get { return true; } }
public bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, TargetModifiers modifiers, ref string cursor)
public bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, ref TargetModifiers modifiers, ref string cursor)
{
// TODO: When target modifiers are configurable this needs to be revisited
if (modifiers.HasModifier(TargetModifiers.ForceMove) || modifiers.HasModifier(TargetModifiers.ForceQueue))