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

Make CanTarget modifiers a ref parameter.

Browse Source
This commit is contained in:
Paul Chote
2015-11-16 20:38:53 +00:00
parent d2d4767e94
commit 124c0ea041
11 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Orders/UnitOrderGenerator.cs
View File

@@ -130,7 +130,7 @@ namespace OpenRA.Orders
modifiers |= TargetModifiers.ForceMove; modifiers |= TargetModifiers.ForceMove;
string cursor = null; string cursor = null;
if (o.Order.CanTarget(self, target, actorsAt, modifiers, ref cursor)) if (o.Order.CanTarget(self, target, actorsAt, ref modifiers, ref cursor))
return new UnitOrderResult(self, o.Order, o.Trait, cursor, target); return new UnitOrderResult(self, o.Order, o.Trait, cursor, target);
} }
} }

2
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -97,7 +97,7 @@ namespace OpenRA.Traits
{ {
string OrderID { get; } string OrderID { get; }
int OrderPriority { get; } int OrderPriority { get; }
bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, TargetModifiers modifiers, ref string cursor); bool CanTarget(Actor self, Target target, List<Actor> othersAtTarget, ref TargetModifiers modifiers, ref string cursor);
bool IsQueued { get; } bool IsQueued { get; }
bool OverrideSelection { get; } bool OverrideSelection { get; }
} }

2
OpenRA.Mods.Common/Orders/AircraftMoveOrderTargeter.cs
View File

@@ -24,7 +24,7 @@ namespace OpenRA.Mods.Common.Orders
public AircraftMoveOrderTargeter(AircraftInfo info) { this.info = info; } public AircraftMoveOrderTargeter(AircraftInfo info) { this.info = info; }
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) if (target.Type != TargetType.Terrain)
return false; return false;

2
OpenRA.Mods.Common/Orders/DeployOrderTargeter.cs
View File

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.Common.Orders
public int OrderPriority { get; private set; } public int OrderPriority { get; private set; }
public bool OverrideSelection { get { return true; } } 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.Actor) if (target.Type != TargetType.Actor)
return false; return false;

2
OpenRA.Mods.Common/Orders/UnitOrderTargeter.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.Common.Orders
public abstract bool CanTargetActor(Actor self, Actor target, TargetModifiers modifiers, ref string cursor); public abstract bool CanTargetActor(Actor self, Actor target, TargetModifiers modifiers, ref string cursor);
public abstract bool CanTargetFrozenActor(Actor self, FrozenActor target, TargetModifiers modifiers, ref string cursor); public abstract bool CanTargetFrozenActor(Actor self, FrozenActor target, TargetModifiers modifiers, ref string cursor);
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)
{ {
var type = target.Type; var type = target.Type;
if (type != TargetType.Actor && type != TargetType.FrozenActor) if (type != TargetType.Actor && type != TargetType.FrozenActor)

6
OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
View File

@@ -279,7 +279,7 @@ namespace OpenRA.Mods.Common.Traits
public int OrderPriority { get; private set; } public int OrderPriority { get; private set; }
public bool OverrideSelection { get { return true; } } public bool OverrideSelection { get { return true; } }
bool CanTargetActor(Actor self, Target target, TargetModifiers modifiers, ref string cursor) bool CanTargetActor(Actor self, Target target, ref TargetModifiers modifiers, ref string cursor)
{ {
IsQueued = modifiers.HasModifier(TargetModifiers.ForceQueue); IsQueued = modifiers.HasModifier(TargetModifiers.ForceQueue);
@@ -326,13 +326,13 @@ namespace OpenRA.Mods.Common.Traits
return true; 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)
{ {
switch (target.Type) switch (target.Type)
{ {
case TargetType.Actor: case TargetType.Actor:
case TargetType.FrozenActor: case TargetType.FrozenActor:
return CanTargetActor(self, target, modifiers, ref cursor); return CanTargetActor(self, target, ref modifiers, ref cursor);
case TargetType.Terrain: case TargetType.Terrain:
return CanTargetLocation(self, self.World.Map.CellContaining(target.CenterPosition), othersAtTarget, modifiers, ref cursor); return CanTargetLocation(self, self.World.Map.CellContaining(target.CenterPosition), othersAtTarget, modifiers, ref cursor);
default: default:

2
OpenRA.Mods.Common/Traits/Buildings/RallyPoint.cs
View File

@@ -84,7 +84,7 @@ namespace OpenRA.Mods.Common.Traits
public int OrderPriority { get { return 0; } } public int OrderPriority { get { return 0; } }
public bool OverrideSelection { get { return true; } } 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) if (target.Type != TargetType.Terrain)
return false; return false;

2
OpenRA.Mods.Common/Traits/Harvester.cs
View File

@@ -453,7 +453,7 @@ namespace OpenRA.Mods.Common.Traits
public bool IsQueued { get; protected set; } public bool IsQueued { get; protected set; }
public bool OverrideSelection { get { return true; } } 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) if (target.Type != TargetType.Terrain)
return false; return false;

2
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -707,7 +707,7 @@ namespace OpenRA.Mods.Common.Traits
public int OrderPriority { get { return 4; } } public int OrderPriority { get { return 4; } }
public bool IsQueued { get; protected set; } public bool IsQueued { get; protected set; }
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 (rejectMove || !target.IsValidFor(self)) if (rejectMove || !target.IsValidFor(self))
return false; return false;

2
OpenRA.Mods.RA/Traits/Minelayer.cs
View File

@@ -199,7 +199,7 @@ namespace OpenRA.Mods.RA.Traits
public int OrderPriority { get { return 5; } } public int OrderPriority { get { return 5; } }
public bool OverrideSelection { get { return true; } } 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) if (target.Type != TargetType.Terrain)
return false; return false;

2
OpenRA.Mods.RA/Traits/PortableChrono.cs
View File

@@ -120,7 +120,7 @@ namespace OpenRA.Mods.RA.Traits
public bool IsQueued { get; protected set; } public bool IsQueued { get; protected set; }
public bool OverrideSelection { get { return true; } } 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 // TODO: When target modifiers are configurable this needs to be revisited
if (modifiers.HasModifier(TargetModifiers.ForceMove) || modifiers.HasModifier(TargetModifiers.ForceQueue)) if (modifiers.HasModifier(TargetModifiers.ForceMove) || modifiers.HasModifier(TargetModifiers.ForceQueue))