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

Add missing self and optional pretick parameters to Queue, QueueChild and PrintActivity methods.

Browse Source 
This means sequenceActivities needs to accept self as well.
This commit is contained in:
tovl
2019-02-27 23:24:45 +01:00
committed by Paul Chote
parent 69004f2b94
commit 8191a6566b
32 changed files with 82 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,20 +234,20 @@ namespace OpenRA.Activities
return true;
}
public virtual void Queue(Activity activity)
public virtual void Queue(Actor self, Activity activity, bool pretick = false)
{
if (NextInQueue != null)
NextInQueue.Queue(activity);
NextInQueue.Queue(self, activity);
else
NextInQueue = activity;
NextInQueue = pretick ? ActivityUtils.RunActivity(self, activity) : activity;
}
public virtual void QueueChild(Activity activity)
public virtual void QueueChild(Actor self, Activity activity, bool pretick = false)
{
if (ChildActivity != null)
ChildActivity.Queue(activity);
ChildActivity.Queue(self, activity);
else
ChildActivity = activity;
ChildActivity = pretick ? ActivityUtils.RunActivity(self, activity) : activity;
}
/// <summary>
@@ -258,10 +258,10 @@ namespace OpenRA.Activities
/// </summary>
/// <param name="origin">Activity from which to start traversing, and which to mark. If null, mark the calling activity, and start traversal from the root.</param>
/// <param name="level">Initial level of indentation.</param>
protected void PrintActivityTree(Activity origin = null, int level = 0)
protected void PrintActivityTree(Actor self, Activity origin = null, int level = 0)
{
if (origin == null)
RootActivity.PrintActivityTree(this);
RootActivity.PrintActivityTree(self, this);
else
{
Console.Write(new string(' ', level * 2));
@@ -271,10 +271,10 @@ namespace OpenRA.Activities
Console.WriteLine(this.GetType().ToString().Split('.').Last());
if (ChildActivity != null)
ChildActivity.PrintActivityTree(origin, level + 1);
ChildActivity.PrintActivityTree(self, origin, level + 1);
if (NextInQueue != null)
NextInQueue.PrintActivityTree(origin, level);
NextInQueue.PrintActivityTree(self, origin, level);
}
}

2
OpenRA.Game/Actor.cs
View File

@@ -222,7 +222,7 @@ namespace OpenRA
if (CurrentActivity == null)
CurrentActivity = nextActivity;
else
CurrentActivity.RootActivity.Queue(nextActivity);
CurrentActivity.RootActivity.Queue(this, nextActivity);
}
public bool CancelActivity()

4
OpenRA.Game/Traits/ActivityUtils.cs
View File

@@ -51,10 +51,10 @@ namespace OpenRA.Traits
return act;
}
public static Activity SequenceActivities(params Activity[] acts)
public static Activity SequenceActivities(Actor self, params Activity[] acts)
{
return acts.Reverse().Aggregate(
(next, a) => { a.Queue(next); return a; });
(next, a) => { a.Queue(self, next); return a; });
}
}
}