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

Remove order.TargetActor from Infiltrates, EngineerRepair, ExternalCaptures.

Browse Source 
These cases already checked order.Target.Type so these are simple swaps.
This commit is contained in:
Paul Chote
2018-05-23 19:41:03 +00:00
committed by reaperrr
parent 6e400c5d60
commit 4a7bb39fbe
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Cnc/Traits/Infiltration/Infiltrates.cs
View File

@@ -78,7 +78,7 @@ namespace OpenRA.Mods.Cnc.Traits
targetTypes = order.Target.FrozenActor.TargetTypes; targetTypes = order.Target.FrozenActor.TargetTypes;
if (order.Target.Type == TargetType.Actor) if (order.Target.Type == TargetType.Actor)
targetTypes = order.TargetActor.GetEnabledTargetTypes(); targetTypes = order.Target.Actor.GetEnabledTargetTypes();
return Info.Types.Overlaps(targetTypes); return Info.Types.Overlaps(targetTypes);
} }

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

@@ -60,7 +60,7 @@ namespace OpenRA.Mods.Common.Traits
return order.Target.FrozenActor.DamageState > DamageState.Undamaged; return order.Target.FrozenActor.DamageState > DamageState.Undamaged;
if (order.Target.Type == TargetType.Actor) if (order.Target.Type == TargetType.Actor)
return order.TargetActor.GetDamageState() > DamageState.Undamaged; return order.Target.Actor.GetDamageState() > DamageState.Undamaged;
return false; return false;
} }

4
OpenRA.Mods.Common/Traits/ExternalCaptures.cs
View File

@@ -80,8 +80,8 @@ namespace OpenRA.Mods.Common.Traits
if (order.Target.Type == TargetType.Actor) if (order.Target.Type == TargetType.Actor)
{ {
var c = order.TargetActor.TraitOrDefault<ExternalCapturable>(); var c = order.Target.Actor.TraitOrDefault<ExternalCapturable>();
return c != null && !c.CaptureInProgress && c.CanBeTargetedBy(self, order.TargetActor.Owner); return c != null && !c.CaptureInProgress && c.CanBeTargetedBy(self, order.Target.Actor.Owner);
} }
return false; return false;