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

Move ChildActivity handling into base Activity class.

Browse Source
This commit is contained in:
tovl
2019-04-30 22:45:02 +02:00
committed by teinarss
parent 37379daf3c
commit b9c302a73a
43 changed files with 139 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
OpenRA.Game/Activities/Activity.cs
View File

@@ -41,11 +41,13 @@ namespace OpenRA.Activities
public Activity NextActivity { get; protected set; }
public bool IsInterruptible { get; protected set; }
public bool ChildHasPriority { get; protected set; }
public bool IsCanceling { get { return State == ActivityState.Canceling; } }
public Activity()
{
IsInterruptible = true;
ChildHasPriority = true;
}
public Activity TickOuter(Actor self)
@@ -59,7 +61,18 @@ namespace OpenRA.Activities
State = ActivityState.Active;
}
if (ChildHasPriority)
{
ChildActivity = ActivityUtils.RunActivity(self, ChildActivity);
if (ChildActivity != null)
return this;
}
var ret = Tick(self);
if (ChildActivity != null && ChildActivity.State == ActivityState.Queued)
ChildActivity = ActivityUtils.RunActivity(self, ChildActivity);
if (ret != this)
{
State = ActivityState.Done;
@@ -113,20 +126,20 @@ namespace OpenRA.Activities
State = ActivityState.Canceling;
}
public virtual void Queue(Actor self, Activity activity)
public void Queue(Activity activity)
{
if (NextActivity != null)
NextActivity.Queue(self, activity);
NextActivity.Queue(activity);
else
NextActivity = activity;
}
public virtual void QueueChild(Actor self, Activity activity, bool pretick = false)
public void QueueChild(Activity activity)
{
if (ChildActivity != null)
ChildActivity.Queue(self, activity);
ChildActivity.Queue(activity);
else
ChildActivity = pretick ? ActivityUtils.RunActivity(self, activity) : activity;
ChildActivity = activity;
}
/// <summary>
@@ -187,15 +200,4 @@ namespace OpenRA.Activities
yield return a;
}
}
public static class ActivityExts
{
public static IEnumerable<Target> GetTargetQueue(this Actor self)
{
return self.CurrentActivity
.Iterate(u => u.NextActivity)
.TakeWhile(u => u != null)
.SelectMany(u => u.GetTargets(self));
}
}
}