Tidy up Activity.Cancel(), make Tick abstract

This commit is contained in:
Paul Chote
2011-04-16 13:18:22 +12:00
parent 0a67c68c45
commit 4f83e994d0
14 changed files with 47 additions and 54 deletions

View File

@@ -5,24 +5,17 @@ using System.Text;
namespace OpenRA.Traits.Activities
{
public class Activity
public abstract class Activity
{
public Activity NextActivity { get; set; }
protected bool IsCanceled { get; private set; }
public virtual Activity Tick( Actor self )
{
return this;
}
protected virtual bool OnCancel( Actor self ) { return true; }
public abstract Activity Tick( Actor self );
public virtual void Cancel( Actor self )
{
IsCanceled = OnCancel( self );
if( IsCanceled )
NextActivity = null;
else if (NextActivity != null)
NextActivity.Cancel( self );
IsCanceled = true;
NextActivity = null;
}
public virtual void Queue( Activity activity )