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

Introduce Target.Type property.

Browse Source
This commit is contained in:
Paul Chote
2013-08-07 22:51:48 +12:00
parent fa517b8787
commit 4f3c9aa0af
18 changed files with 56 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/Attack/AttackBase.cs
View File

@@ -54,7 +54,7 @@ namespace OpenRA.Mods.RA
if (self.IsDisabled())
return false;
if (target.IsActor && target.Actor.HasTrait<ITargetable>() &&
if (target.Type == TargetType.Actor && target.Actor.HasTrait<ITargetable>() &&
!target.Actor.Trait<ITargetable>().TargetableBy(target.Actor,self))
return false;
@@ -114,7 +114,7 @@ namespace OpenRA.Mods.RA
{
if (order is AttackOrderTargeter)
{
if (target.IsActor)
if (target.Type == TargetType.Actor)
return new Order("Attack", self, queued) { TargetActor = target.Actor };
else
return new Order("Attack", self, queued) { TargetLocation = target.CenterPosition.ToCPos() };

2
OpenRA.Mods.RA/Attack/AttackLeap.cs
View File

@@ -37,7 +37,7 @@ namespace OpenRA.Mods.RA
public override void DoAttack(Actor self, Target target)
{
if (!CanAttack(self, target) || !target.IsActor)
if (target.Type != TargetType.Actor || !CanAttack(self, target))
return;
var a = ChooseArmamentForTarget(target);

2
OpenRA.Mods.RA/Attack/AttackTurreted.cs
View File

@@ -67,7 +67,7 @@ namespace OpenRA.Mods.RA
base.ResolveOrder(self, order);
if (order.OrderString == "Stop")
target = Target.None;
target = Target.Invalid;
}
public virtual void BuildingComplete(Actor self) { buildComplete = true; }