Revert "Have some activities count as idle activities"
This reverts commit ae111248f3.
This commit is contained in:
@@ -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; } }
|
||||
|
||||
|
||||
@@ -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; } }
|
||||
|
||||
@@ -21,7 +21,6 @@ namespace OpenRA.Mods.Common.Activities
|
||||
|
||||
public FlyCircle(Actor self)
|
||||
{
|
||||
IsIdle = true;
|
||||
plane = self.Trait<Aircraft>();
|
||||
cruiseAltitude = plane.Info.CruiseAltitude;
|
||||
}
|
||||
|
||||
@@ -22,7 +22,6 @@ namespace OpenRA.Mods.Common.Activities
|
||||
public HeliFlyCircle(Actor self)
|
||||
{
|
||||
helicopter = self.Trait<Aircraft>();
|
||||
IsIdle = true;
|
||||
}
|
||||
|
||||
public override Activity Tick(Actor self)
|
||||
|
||||
Reference in New Issue
Block a user