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

Remove ResolveFrozenActorOrder from Carryall.

Browse Source
This commit is contained in:
Paul Chote
2019-01-22 22:30:45 +00:00
committed by Oliver Brakmann
parent 71dd3202c3
commit 240c2243f2
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.Common/Traits/Carryall.cs
View File

@@ -265,18 +265,17 @@ namespace OpenRA.Mods.Common.Traits
{ {
if (order.OrderString == "PickupUnit") if (order.OrderString == "PickupUnit")
{ {
var target = self.ResolveFrozenActorOrder(order, Color.Yellow); if (order.Target.Type != TargetType.Actor)
if (target.Type != TargetType.Actor)
return; return;
if (!ReserveCarryable(self, target.Actor)) if (!ReserveCarryable(self, order.Target.Actor))
return; return;
if (!order.Queued) if (!order.Queued)
self.CancelActivity(); self.CancelActivity();
self.SetTargetLine(target, Color.Yellow); self.SetTargetLine(order.Target, Color.Yellow);
self.QueueActivity(order.Queued, new PickupUnit(self, target.Actor, Info.LoadingDelay)); self.QueueActivity(order.Queued, new PickupUnit(self, order.Target.Actor, Info.LoadingDelay));
} }
} }
} }