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

Remove Actor.HasTrait<T>()

Browse Source
This commit is contained in:
atlimit8
2015-08-01 23:53:58 -05:00
parent 959914779f
commit 85fab45451
79 changed files with 153 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/AI/States/AirStates.cs
View File

@@ -30,7 +30,7 @@ namespace OpenRA.Mods.Common.AI
var missileUnitsCount = 0;
foreach (var unit in units)
{
if (unit != null && unit.HasTrait<AttackBase>() && !unit.HasTrait<Aircraft>()
if (unit != null && unit.Info.Traits.Contains<AttackBaseInfo>() && !unit.Info.Traits.Contains<AircraftInfo>()
&& !unit.IsDisabled())
{
var arms = unit.TraitsImplementing<Armament>();
@@ -223,7 +223,7 @@ namespace OpenRA.Mods.Common.AI
continue;
}
if (owner.TargetActor.HasTrait<ITargetable>() && CanAttackTarget(a, owner.TargetActor))
if (owner.TargetActor.Info.Traits.Contains<ITargetableInfo>() && CanAttackTarget(a, owner.TargetActor))
owner.Bot.QueueOrder(new Order("Attack", a, false) { TargetActor = owner.TargetActor });
}
}