add self param to OnCancel

This commit is contained in:
Bob
2010-10-23 20:08:25 +13:00
committed by Chris Forbes
parent 9a54074b1b
commit c4ee5fbd41
6 changed files with 7 additions and 7 deletions

View File

@@ -186,11 +186,11 @@ namespace OpenRA.Traits
protected bool IsCanceled { get; private set; } protected bool IsCanceled { get; private set; }
public abstract IActivity Tick( Actor self ); public abstract IActivity Tick( Actor self );
protected virtual bool OnCancel() { return true; } protected virtual bool OnCancel( Actor self ) { return true; }
public void Cancel( Actor self ) public void Cancel( Actor self )
{ {
IsCanceled = OnCancel(); IsCanceled = OnCancel( self );
if( IsCanceled ) if( IsCanceled )
NextActivity = null; NextActivity = null;
else if (NextActivity != null) else if (NextActivity != null)

View File

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.RA.Activities
return this; return this;
} }
protected override bool OnCancel() protected override bool OnCancel( Actor self )
{ {
return Interruptible; return Interruptible;
} }

View File

@@ -37,7 +37,7 @@ namespace OpenRA.Mods.RA.Activities
return this; return this;
} }
protected override bool OnCancel() protected override bool OnCancel( Actor self )
{ {
active = false; active = false;
return true; return true;

View File

@@ -30,7 +30,7 @@ namespace OpenRA.Mods.RA.Activities
return this; return this;
} }
protected override bool OnCancel() protected override bool OnCancel( Actor self )
{ {
if( !interruptable ) return false; if( !interruptable ) return false;
remainingTicks = 0; remainingTicks = 0;

View File

@@ -52,6 +52,6 @@ namespace OpenRA.Mods.RA
return this; return this;
} }
protected override bool OnCancel() { return false; } protected override bool OnCancel( Actor self ) { return false; }
} }
} }

View File

@@ -230,7 +230,7 @@ namespace OpenRA.Mods.RA.Move
return nextCell; return nextCell;
} }
protected override bool OnCancel() protected override bool OnCancel( Actor self )
{ {
path = new List<int2>(); path = new List<int2>();
return true; return true;