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

Tidy up Activity.Cancel(), make Tick abstract

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Game/Traits/Activities/CancelableActivity.cs
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 )
IsCanceled = true;
NextActivity = null;
else if (NextActivity != null)
NextActivity.Cancel( self );
}
public virtual void Queue( Activity activity )

4
OpenRA.Mods.Cnc/Activities/HarvesterDockSequence.cs
View File

@@ -80,10 +80,10 @@ namespace OpenRA.Mods.Cnc
throw new InvalidOperationException("Invalid harvester dock state");
}
protected override bool OnCancel(Actor self)
public override void Cancel(Actor self)
{
state = State.Undock;
return true;
base.Cancel(self);
}
public override IEnumerable<Target> GetTargets( Actor self )

9
OpenRA.Mods.RA/Activities/CallFunc.cs
View File

@@ -33,13 +33,10 @@ namespace OpenRA.Mods.RA.Activities
return NextActivity;
}
protected override bool OnCancel(Actor self)
public override void Cancel(Actor self)
{
if (!interruptable)
return false;
a = null;
return true;
if (interruptable)
base.Cancel(self);
}
}
}

8
OpenRA.Mods.RA/Activities/DeliverOre.cs
View File

@@ -23,6 +23,7 @@ namespace OpenRA.Mods.RA.Activities
public override Activity Tick( Actor self )
{
// TODO: wtf is this?
if( NextActivity != null )
return NextActivity;
@@ -49,10 +50,7 @@ namespace OpenRA.Mods.RA.Activities
return Util.SequenceActivities( new Wait(10), this );
}
protected override bool OnCancel(Actor self)
{
// TODO: allow canceling of deliver orders?
return false;
}
// Cannot be cancelled
public override void Cancel(Actor self) { }
}
}

5
OpenRA.Mods.RA/Activities/MakeAnimation.cs
View File

@@ -30,7 +30,6 @@ namespace OpenRA.Mods.RA.Activities
bool started = false;
public override Activity Tick( Actor self )
{
if (IsCanceled) return NextActivity;
if (!started)
{
var rb = self.Trait<RenderBuilding>();
@@ -51,7 +50,7 @@ namespace OpenRA.Mods.RA.Activities
return complete ? NextActivity : this;
}
// Not actually cancellable
protected override bool OnCancel( Actor self ) { return false; }
// Cannot be cancelled
public override void Cancel( Actor self ) { }
}
}

4
OpenRA.Mods.RA/Activities/RAHarvesterDockSequence.cs
View File

@@ -70,10 +70,10 @@ namespace OpenRA.Mods.RA
throw new InvalidOperationException("Invalid harvester dock state");
}
protected override bool OnCancel(Actor self)
public override void Cancel(Actor self)
{
state = State.Undock;
return true;
base.Cancel(self);
}
public override IEnumerable<Target> GetTargets( Actor self )

4
OpenRA.Mods.RA/Activities/Sell.cs
View File

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.RA.Activities
return this;
}
// Not actually cancellable
protected override bool OnCancel( Actor self ) { return false; }
// Cannot be cancelled
public override void Cancel( Actor self ) { }
}
}

11
OpenRA.Mods.RA/Activities/Wait.cs
View File

@@ -27,15 +27,16 @@ namespace OpenRA.Mods.RA.Activities
public override Activity Tick(Actor self)
{
if (remainingTicks-- == 0) return NextActivity;
return this;
return (remainingTicks-- == 0) ? NextActivity: this;
}
protected override bool OnCancel( Actor self )
public override void Cancel( Actor self )
{
if( !interruptable ) return false;
if( !interruptable )
return;
remainingTicks = 0;
return true;
base.Cancel(self);
}
}
}

3
OpenRA.Mods.RA/Air/FallsToEarth.cs
View File

@@ -73,6 +73,7 @@ namespace OpenRA.Mods.RA.Air
return this;
}
protected override bool OnCancel(Actor self) { return false; }
// Cannot be cancelled
public override void Cancel( Actor self ) { }
}
}

5
OpenRA.Mods.RA/Air/FlyAttack.cs
View File

@@ -44,11 +44,12 @@ namespace OpenRA.Mods.RA.Air
return this;
}
protected override bool OnCancel( Actor self )
public override void Cancel( Actor self )
{
if( inner != null )
inner.Cancel( self );
return base.OnCancel( self );
base.Cancel( self );
}
}

9
OpenRA.Mods.RA/Air/FlyTimed.cs
View File

@@ -36,14 +36,17 @@ namespace OpenRA.Mods.RA.Air
public override Activity Tick(Actor self)
{
var targetAltitude = self.Info.Traits.Get<PlaneInfo>().CruiseAltitude;
if (IsCanceled || !self.World.Map.IsInMap(self.Location)) return NextActivity;
if (IsCanceled || !self.World.Map.IsInMap(self.Location))
return NextActivity;
FlyUtil.Fly(self, targetAltitude);
return this;
}
protected override bool OnCancel( Actor self )
public override void Cancel( Actor self )
{
return Interruptible;
if (Interruptible)
base.Cancel(self);
}
}
}

5
OpenRA.Mods.RA/AttackMove.cs
View File

@@ -90,11 +90,12 @@ namespace OpenRA.Mods.RA
return this;
}
protected override bool OnCancel( Actor self )
public override void Cancel( Actor self )
{
if( inner != null )
inner.Cancel( self );
return base.OnCancel( self );
base.Cancel( self );
}
}
}

8
OpenRA.Mods.RA/Move/Drag.cs
View File

@@ -42,14 +42,12 @@ namespace OpenRA.Mods.RA.Move
return this;
}
protected override bool OnCancel(Actor self)
{
return false;
}
public override IEnumerable<Target> GetTargets( Actor self )
{
yield return Target.FromPos(endLocation);
}
// Cannot be cancelled
public override void Cancel( Actor self ) { }
}
}

9
OpenRA.Mods.RA/Move/Move.cs
View File

@@ -233,10 +233,10 @@ namespace OpenRA.Mods.RA.Move
return Pair.New(nextCell, subCell);
}
protected override bool OnCancel( Actor self )
public override void Cancel( Actor self )
{
path = new List<int2>();
return true;
base.Cancel(self);
}
public override IEnumerable<Target> GetTargets( Actor self )
@@ -267,9 +267,10 @@ namespace OpenRA.Mods.RA.Move
this.moveFractionTotal = ( ( to - from ) * 3 ).Length;
}
protected override bool OnCancel( Actor self )
public override void Cancel( Actor self )
{
return move.OnCancel( self );
move.Cancel( self );
base.Cancel( self );
}
public override void Queue( Activity activity )