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

Cache trait look-ups in the constructor where possible for Air activities/traits

Browse Source
This commit is contained in:
reaperrr
2015-03-14 03:59:37 +01:00
parent 9a780ba07d
commit 1e9d1a6cb7
22 changed files with 160 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
OpenRA.Mods.Common/Activities/Air/FlyTimed.cs
View File

@@ -16,37 +16,25 @@ namespace OpenRA.Mods.Common.Activities
{
public class FlyTimed : Activity
{
readonly Plane plane;
readonly WRange cruiseAltitude;
int remainingTicks;
public FlyTimed(int ticks) { remainingTicks = ticks; }
public FlyTimed(int ticks, Actor self)
{
remainingTicks = ticks;
plane = self.Trait<Plane>();
cruiseAltitude = plane.Info.CruiseAltitude;
}
public override Activity Tick(Actor self)
{
if (IsCanceled || remainingTicks-- == 0)
return NextActivity;
var plane = self.Trait<Plane>();
Fly.FlyToward(self, plane, plane.Facing, plane.Info.CruiseAltitude);
Fly.FlyToward(self, plane, plane.Facing, cruiseAltitude);
return this;
}
}
public class FlyOffMap : Activity
{
public override Activity Tick(Actor self)
{
if (IsCanceled || !self.World.Map.Contains(self.Location))
return NextActivity;
var plane = self.Trait<Plane>();
Fly.FlyToward(self, plane, plane.Facing, plane.Info.CruiseAltitude);
return this;
}
public override void Cancel(Actor self)
{
base.Cancel(self);
}
}
}