From c4ee5fbd416778cd85c3b6da255727f43e661eab Mon Sep 17 00:00:00 2001 From: Bob Date: Sat, 23 Oct 2010 20:08:25 +1300 Subject: [PATCH] add self param to OnCancel --- OpenRA.Game/Traits/TraitsInterfaces.cs | 4 ++-- OpenRA.Mods.RA/Activities/FlyTimed.cs | 2 +- OpenRA.Mods.RA/Activities/IdleAnimation.cs | 2 +- OpenRA.Mods.RA/Activities/Wait.cs | 2 +- OpenRA.Mods.RA/FallsToEarth.cs | 2 +- OpenRA.Mods.RA/Move/Move.cs | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs index fd4613e248..7acefd4a17 100644 --- a/OpenRA.Game/Traits/TraitsInterfaces.cs +++ b/OpenRA.Game/Traits/TraitsInterfaces.cs @@ -186,11 +186,11 @@ namespace OpenRA.Traits protected bool IsCanceled { get; private set; } 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 ) { - IsCanceled = OnCancel(); + IsCanceled = OnCancel( self ); if( IsCanceled ) NextActivity = null; else if (NextActivity != null) diff --git a/OpenRA.Mods.RA/Activities/FlyTimed.cs b/OpenRA.Mods.RA/Activities/FlyTimed.cs index 035382b2e1..ee572d1dc0 100644 --- a/OpenRA.Mods.RA/Activities/FlyTimed.cs +++ b/OpenRA.Mods.RA/Activities/FlyTimed.cs @@ -40,7 +40,7 @@ namespace OpenRA.Mods.RA.Activities return this; } - protected override bool OnCancel() + protected override bool OnCancel( Actor self ) { return Interruptible; } diff --git a/OpenRA.Mods.RA/Activities/IdleAnimation.cs b/OpenRA.Mods.RA/Activities/IdleAnimation.cs index bfe8065773..5bb54a2192 100644 --- a/OpenRA.Mods.RA/Activities/IdleAnimation.cs +++ b/OpenRA.Mods.RA/Activities/IdleAnimation.cs @@ -37,7 +37,7 @@ namespace OpenRA.Mods.RA.Activities return this; } - protected override bool OnCancel() + protected override bool OnCancel( Actor self ) { active = false; return true; diff --git a/OpenRA.Mods.RA/Activities/Wait.cs b/OpenRA.Mods.RA/Activities/Wait.cs index 678b595e88..bab4f72a26 100644 --- a/OpenRA.Mods.RA/Activities/Wait.cs +++ b/OpenRA.Mods.RA/Activities/Wait.cs @@ -30,7 +30,7 @@ namespace OpenRA.Mods.RA.Activities return this; } - protected override bool OnCancel() + protected override bool OnCancel( Actor self ) { if( !interruptable ) return false; remainingTicks = 0; diff --git a/OpenRA.Mods.RA/FallsToEarth.cs b/OpenRA.Mods.RA/FallsToEarth.cs index 582fa69f80..32adabc451 100644 --- a/OpenRA.Mods.RA/FallsToEarth.cs +++ b/OpenRA.Mods.RA/FallsToEarth.cs @@ -52,6 +52,6 @@ namespace OpenRA.Mods.RA return this; } - protected override bool OnCancel() { return false; } + protected override bool OnCancel( Actor self ) { return false; } } } diff --git a/OpenRA.Mods.RA/Move/Move.cs b/OpenRA.Mods.RA/Move/Move.cs index 478e7732a1..b90a7e34e8 100755 --- a/OpenRA.Mods.RA/Move/Move.cs +++ b/OpenRA.Mods.RA/Move/Move.cs @@ -230,7 +230,7 @@ namespace OpenRA.Mods.RA.Move return nextCell; } - protected override bool OnCancel() + protected override bool OnCancel( Actor self ) { path = new List(); return true;