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

Turn Actor.GetCurrentActivity into a property

Browse Source
This commit is contained in:
Oliver Brakmann
2016-10-29 16:56:31 +02:00
parent 04dbda6dcd
commit 3e9bf7aa4d
8 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenRA.Game/Actor.cs
View File

@@ -43,7 +43,7 @@ namespace OpenRA
public bool IsInWorld { get; internal set; }
public bool Disposed { get; private set; }
Activity currentActivity;
public Activity CurrentActivity { get; private set; }
public Group Group;
public int Generation;
@@ -54,7 +54,7 @@ namespace OpenRA
public IOccupySpace OccupiesSpace { get; private set; }
public ITargetable[] Targetables { get; private set; }
public bool IsIdle { get { return currentActivity == null; } }
public bool IsIdle { get { return CurrentActivity == null; } }
public bool IsDead { get { return Disposed || (health != null && health.IsDead); } }
public CPos Location { get { return OccupiesSpace.TopLeft; } }
@@ -161,7 +161,7 @@ namespace OpenRA
public void Tick()
{
var wasIdle = IsIdle;
currentActivity = ActivityUtils.RunActivity(this, currentActivity);
CurrentActivity = ActivityUtils.RunActivity(this, CurrentActivity);
if (!wasIdle && IsIdle)
foreach (var n in TraitsImplementing<INotifyBecomingIdle>())
@@ -200,21 +200,16 @@ namespace OpenRA
public void QueueActivity(Activity nextActivity)
{
if (currentActivity == null)
currentActivity = nextActivity;
if (CurrentActivity == null)
CurrentActivity = nextActivity;
else
currentActivity.Queue(nextActivity);
CurrentActivity.Queue(nextActivity);
}
public void CancelActivity()
{
if (currentActivity != null)
currentActivity.Cancel(this);
}
public Activity GetCurrentActivity()
{
return currentActivity;
if (CurrentActivity != null)
CurrentActivity.Cancel(this);
}
public override int GetHashCode()