QueuedActivity's Insert is broken

This commit is contained in:
alzeih
2011-03-18 00:18:57 +13:00
committed by Paul Chote
parent 4e89326134
commit 255bac6aff
64 changed files with 218 additions and 251 deletions

View File

@@ -13,13 +13,13 @@ using OpenRA.Traits.Activities;
namespace OpenRA.Mods.RA.Air
{
public class FlyTimed : CancelableActivity
public class FlyTimed : Activity
{
int remainingTicks;
public FlyTimed(int ticks) { remainingTicks = ticks; }
public override IActivity Tick(Actor self)
public override Activity Tick(Actor self)
{
if( IsCanceled ) return NextActivity;
var targetAltitude = self.Info.Traits.Get<PlaneInfo>().CruiseAltitude;
@@ -29,11 +29,11 @@ namespace OpenRA.Mods.RA.Air
}
}
public class FlyOffMap : CancelableActivity
public class FlyOffMap : Activity
{
public bool Interruptible = true;
public override IActivity Tick(Actor self)
public override Activity Tick(Actor self)
{
var targetAltitude = self.Info.Traits.Get<PlaneInfo>().CruiseAltitude;
if (IsCanceled || !self.World.Map.IsInMap(self.Location)) return NextActivity;