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

Remove pretick argument from Activity.Queue()

Browse Source 
Pre-ticking a next activity would break the assumption that activities
in a queue would be processed in sequence.
This commit is contained in:
Oliver Brakmann
2019-03-24 12:13:51 +01:00
committed by Paul Chote
parent 9a15df9dde
commit 44ca01d36c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -215,12 +215,12 @@ namespace OpenRA.Activities
State = ActivityState.Canceling; State = ActivityState.Canceling;
} }
public virtual void Queue(Actor self, Activity activity, bool pretick = false) public virtual void Queue(Actor self, Activity activity)
{ {
if (NextInQueue != null) if (NextInQueue != null)
NextInQueue.Queue(self, activity); NextInQueue.Queue(self, activity);
else else
NextInQueue = pretick ? ActivityUtils.RunActivity(self, activity) : activity; NextInQueue = activity;
} }
public virtual void QueueChild(Actor self, Activity activity, bool pretick = false) public virtual void QueueChild(Actor self, Activity activity, bool pretick = false)

2
OpenRA.Mods.Common/Activities/Parachute.cs
View File

@@ -81,7 +81,7 @@ namespace OpenRA.Mods.Common.Activities
} }
// Only the last queued activity (given order) is kept // Only the last queued activity (given order) is kept
public override void Queue(Actor self, Activity activity, bool pretick = false) public override void Queue(Actor self, Activity activity)
{ {
NextActivity = activity; NextActivity = activity;
} }