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

Revert "Have some activities count as idle activities"

Browse Source 
This reverts commit ae111248f3.
This commit is contained in:
Paul Chote
2017-08-09 22:11:39 +01:00
committed by abcdefg30
parent 86cff9a774
commit dd709a2679
4 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,7 +152,6 @@ namespace OpenRA.Activities
set { NextActivity = value; } set { NextActivity = value; }
} }
public bool IsIdle { get; protected set; }
public bool IsInterruptible { get; protected set; } public bool IsInterruptible { get; protected set; }
public bool IsCanceled { get { return State == ActivityState.Canceled; } } public bool IsCanceled { get { return State == ActivityState.Canceled; } }

2
OpenRA.Game/Actor.cs
View File

@@ -53,7 +53,7 @@ namespace OpenRA
public IOccupySpace OccupiesSpace { get; private set; } public IOccupySpace OccupiesSpace { get; private set; }
public ITargetable[] Targetables { 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 bool IsDead { get { return Disposed || (health != null && health.IsDead); } }
public CPos Location { get { return OccupiesSpace.TopLeft; } } public CPos Location { get { return OccupiesSpace.TopLeft; } }

1
OpenRA.Mods.Common/Activities/Air/FlyCircle.cs
View File

@@ -21,7 +21,6 @@ namespace OpenRA.Mods.Common.Activities
public FlyCircle(Actor self) public FlyCircle(Actor self)
{ {
IsIdle = true;
plane = self.Trait<Aircraft>(); plane = self.Trait<Aircraft>();
cruiseAltitude = plane.Info.CruiseAltitude; cruiseAltitude = plane.Info.CruiseAltitude;
} }

1
OpenRA.Mods.Common/Activities/Air/HeliFlyCircle.cs
View File

@@ -22,7 +22,6 @@ namespace OpenRA.Mods.Common.Activities
public HeliFlyCircle(Actor self) public HeliFlyCircle(Actor self)
{ {
helicopter = self.Trait<Aircraft>(); helicopter = self.Trait<Aircraft>();
IsIdle = true;
} }
public override Activity Tick(Actor self) public override Activity Tick(Actor self)