From dd709a26791a012ae014af0e2793fd7cdf94bcf7 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Wed, 9 Aug 2017 22:11:39 +0100 Subject: [PATCH] Revert "Have some activities count as idle activities" This reverts commit ae111248f34a6ee51d3d7b7b6ab304e66306f86a. --- OpenRA.Game/Activities/Activity.cs | 1 - OpenRA.Game/Actor.cs | 2 +- OpenRA.Mods.Common/Activities/Air/FlyCircle.cs | 1 - OpenRA.Mods.Common/Activities/Air/HeliFlyCircle.cs | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/OpenRA.Game/Activities/Activity.cs b/OpenRA.Game/Activities/Activity.cs index 45fbf91f38..18a188d6e2 100644 --- a/OpenRA.Game/Activities/Activity.cs +++ b/OpenRA.Game/Activities/Activity.cs @@ -152,7 +152,6 @@ namespace OpenRA.Activities set { NextActivity = value; } } - public bool IsIdle { get; protected set; } public bool IsInterruptible { get; protected set; } public bool IsCanceled { get { return State == ActivityState.Canceled; } } diff --git a/OpenRA.Game/Actor.cs b/OpenRA.Game/Actor.cs index 148385fe1f..1192346848 100644 --- a/OpenRA.Game/Actor.cs +++ b/OpenRA.Game/Actor.cs @@ -53,7 +53,7 @@ namespace OpenRA public IOccupySpace OccupiesSpace { get; private set; } public ITargetable[] Targetables { get; private set; } - public bool IsIdle { get { return CurrentActivity == null || CurrentActivity.IsIdle; } } + public bool IsIdle { get { return CurrentActivity == null; } } public bool IsDead { get { return Disposed || (health != null && health.IsDead); } } public CPos Location { get { return OccupiesSpace.TopLeft; } } diff --git a/OpenRA.Mods.Common/Activities/Air/FlyCircle.cs b/OpenRA.Mods.Common/Activities/Air/FlyCircle.cs index 875f5c4555..dbf9197d7b 100644 --- a/OpenRA.Mods.Common/Activities/Air/FlyCircle.cs +++ b/OpenRA.Mods.Common/Activities/Air/FlyCircle.cs @@ -21,7 +21,6 @@ namespace OpenRA.Mods.Common.Activities public FlyCircle(Actor self) { - IsIdle = true; plane = self.Trait(); cruiseAltitude = plane.Info.CruiseAltitude; } diff --git a/OpenRA.Mods.Common/Activities/Air/HeliFlyCircle.cs b/OpenRA.Mods.Common/Activities/Air/HeliFlyCircle.cs index 78a0be5688..68db365be7 100644 --- a/OpenRA.Mods.Common/Activities/Air/HeliFlyCircle.cs +++ b/OpenRA.Mods.Common/Activities/Air/HeliFlyCircle.cs @@ -22,7 +22,6 @@ namespace OpenRA.Mods.Common.Activities public HeliFlyCircle(Actor self) { helicopter = self.Trait(); - IsIdle = true; } public override Activity Tick(Actor self)