From 44ca01d36c293345cf6a92dc5bafd9259cb78d88 Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Sun, 24 Mar 2019 12:13:51 +0100 Subject: [PATCH] Remove pretick argument from Activity.Queue() Pre-ticking a next activity would break the assumption that activities in a queue would be processed in sequence. --- OpenRA.Game/Activities/Activity.cs | 4 ++-- OpenRA.Mods.Common/Activities/Parachute.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenRA.Game/Activities/Activity.cs b/OpenRA.Game/Activities/Activity.cs index 620e148f0a..8c82cc43bc 100644 --- a/OpenRA.Game/Activities/Activity.cs +++ b/OpenRA.Game/Activities/Activity.cs @@ -215,12 +215,12 @@ namespace OpenRA.Activities 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) NextInQueue.Queue(self, activity); else - NextInQueue = pretick ? ActivityUtils.RunActivity(self, activity) : activity; + NextInQueue = activity; } public virtual void QueueChild(Actor self, Activity activity, bool pretick = false) diff --git a/OpenRA.Mods.Common/Activities/Parachute.cs b/OpenRA.Mods.Common/Activities/Parachute.cs index 5c8f621327..0f1d8cc505 100644 --- a/OpenRA.Mods.Common/Activities/Parachute.cs +++ b/OpenRA.Mods.Common/Activities/Parachute.cs @@ -81,7 +81,7 @@ namespace OpenRA.Mods.Common.Activities } // 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; }