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

Replace pseudo-childactivities in WaitForTransport.

Browse Source
This commit is contained in:
tovl
2019-04-02 21:50:09 +02:00
committed by Paul Chote
parent a000b173d8
commit 6aea91bd46
1 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OpenRA.Mods.Common/Activities/WaitForTransport.cs
View File

@@ -19,34 +19,25 @@ namespace OpenRA.Mods.Common.Activities
{ {
readonly ICallForTransport transportable; readonly ICallForTransport transportable;
Activity inner;
public WaitForTransport(Actor self, Activity innerActivity) public WaitForTransport(Actor self, Activity innerActivity)
{ {
transportable = self.TraitOrDefault<ICallForTransport>(); transportable = self.TraitOrDefault<ICallForTransport>();
inner = innerActivity; QueueChild(self, innerActivity);
} }
public override Activity Tick(Actor self) public override Activity Tick(Actor self)
{ {
if (inner == null) if (ChildActivity != null)
{ {
if (transportable != null) ChildActivity = ActivityUtils.RunActivity(self, ChildActivity);
transportable.MovementCancelled(self); if (ChildActivity != null)
return this;
return NextActivity;
} }
inner = ActivityUtils.RunActivity(self, inner); if (transportable != null)
return this; transportable.MovementCancelled(self);
}
public override void Cancel(Actor self, bool keepQueue = false) return NextActivity;
{
if (!IsCanceling && inner != null)
inner.Cancel(self);
base.Cancel(self, keepQueue);
} }
} }
} }