rename WRange to WDist

This commit is contained in:
Matthias Mailänder
2015-07-06 16:35:15 +02:00
parent 54e1cf866c
commit 7447e0bf93
100 changed files with 244 additions and 244 deletions

View File

@@ -54,7 +54,7 @@ namespace OpenRA.Mods.Common.Activities
}
var move = info.Moves ? aircraft.FlyStep(aircraft.Facing) : WVec.Zero;
move -= new WVec(WRange.Zero, WRange.Zero, info.Velocity);
move -= new WVec(WDist.Zero, WDist.Zero, info.Velocity);
aircraft.SetPosition(self, aircraft.CenterPosition + move);
return this;

View File

@@ -19,8 +19,8 @@ namespace OpenRA.Mods.Common.Activities
{
readonly Plane plane;
readonly Target target;
readonly WRange maxRange;
readonly WRange minRange;
readonly WDist maxRange;
readonly WDist minRange;
public Fly(Actor self, Target t)
{
@@ -28,14 +28,14 @@ namespace OpenRA.Mods.Common.Activities
target = t;
}
public Fly(Actor self, Target t, WRange minRange, WRange maxRange)
public Fly(Actor self, Target t, WDist minRange, WDist maxRange)
: this(self, t)
{
this.maxRange = maxRange;
this.minRange = minRange;
}
public static void FlyToward(Actor self, Plane plane, int desiredFacing, WRange desiredAltitude)
public static void FlyToward(Actor self, Plane plane, int desiredFacing, WDist desiredAltitude)
{
var move = plane.FlyStep(plane.Facing);
var altitude = plane.CenterPosition.Z;

View File

@@ -17,7 +17,7 @@ namespace OpenRA.Mods.Common.Activities
public class FlyCircle : Activity
{
readonly Plane plane;
readonly WRange cruiseAltitude;
readonly WDist cruiseAltitude;
public FlyCircle(Actor self)
{

View File

@@ -18,10 +18,10 @@ namespace OpenRA.Mods.Common.Activities
{
Target target;
Plane plane;
WRange minRange;
WRange maxRange;
WDist minRange;
WDist maxRange;
public FlyFollow(Actor self, Target target, WRange minRange, WRange maxRange)
public FlyFollow(Actor self, Target target, WDist minRange, WDist maxRange)
{
this.target = target;
plane = self.Trait<Plane>();

View File

@@ -17,7 +17,7 @@ namespace OpenRA.Mods.Common.Activities
public class FlyTimed : Activity
{
readonly Plane plane;
readonly WRange cruiseAltitude;
readonly WDist cruiseAltitude;
int remainingTicks;
public FlyTimed(int ticks, Actor self)

View File

@@ -19,8 +19,8 @@ namespace OpenRA.Mods.Common.Activities
{
readonly Helicopter helicopter;
readonly Target target;
readonly WRange maxRange;
readonly WRange minRange;
readonly WDist maxRange;
readonly WDist minRange;
public HeliFly(Actor self, Target t)
{
@@ -28,14 +28,14 @@ namespace OpenRA.Mods.Common.Activities
target = t;
}
public HeliFly(Actor self, Target t, WRange minRange, WRange maxRange)
public HeliFly(Actor self, Target t, WDist minRange, WDist maxRange)
: this(self, t)
{
this.maxRange = maxRange;
this.minRange = minRange;
}
public static bool AdjustAltitude(Actor self, Helicopter helicopter, WRange targetAltitude)
public static bool AdjustAltitude(Actor self, Helicopter helicopter, WDist targetAltitude)
{
var altitude = helicopter.CenterPosition.Z;
if (altitude == targetAltitude.Range)

View File

@@ -16,7 +16,7 @@ namespace OpenRA.Mods.Common.Activities
public class HeliLand : Activity
{
readonly Helicopter helicopter;
readonly WRange landAltitude;
readonly WDist landAltitude;
bool requireSpace;
public HeliLand(Actor self, bool requireSpace)

View File

@@ -44,7 +44,7 @@ namespace OpenRA.Mods.Common.Activities
}
var desiredFacing = Util.GetFacing(d, plane.Facing);
Fly.FlyToward(self, plane, desiredFacing, WRange.Zero);
Fly.FlyToward(self, plane, desiredFacing, WDist.Zero);
return this;
}