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

Remove Util.GetFacing.

Browse Source
This commit is contained in:
Paul Chote
2016-01-15 19:12:01 +00:00
parent a0979634bb
commit 3b18c7815d
15 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/Activities/Air/Fly.cs
View File

@@ -70,9 +70,8 @@ namespace OpenRA.Mods.Common.Activities
if (d.HorizontalLengthSquared < 91022)
return NextActivity;
var desiredFacing = Util.GetFacing(d, plane.Facing);
// Don't turn until we've reached the cruise altitude
var desiredFacing = d.Yaw.Facing;
var targetAltitude = plane.CenterPosition.Z + plane.Info.CruiseAltitude.Length - self.World.Map.DistanceAboveTerrain(plane.CenterPosition).Length;
if (plane.CenterPosition.Z < targetAltitude)
desiredFacing = plane.Facing;

2
OpenRA.Mods.Common/Activities/Air/HeliAttack.cs
View File

@@ -72,7 +72,7 @@ namespace OpenRA.Mods.Common.Activities
var dist = target.CenterPosition - self.CenterPosition;
// Can rotate facing while ascending
var desiredFacing = Util.GetFacing(dist, helicopter.Facing);
var desiredFacing = dist.HorizontalLengthSquared != 0 ? dist.Yaw.Facing : helicopter.Facing;
helicopter.Facing = Util.TickFacing(helicopter.Facing, desiredFacing, helicopter.ROT);
if (HeliFly.AdjustAltitude(self, helicopter, helicopter.Info.CruiseAltitude))

2
OpenRA.Mods.Common/Activities/Air/HeliFly.cs
View File

@@ -69,7 +69,7 @@ namespace OpenRA.Mods.Common.Activities
// Rotate towards the target
var dist = pos - self.CenterPosition;
var desiredFacing = Util.GetFacing(dist, helicopter.Facing);
var desiredFacing = dist.HorizontalLengthSquared != 0 ? dist.Yaw.Facing : helicopter.Facing;
helicopter.Facing = Util.TickFacing(helicopter.Facing, desiredFacing, helicopter.ROT);
var move = helicopter.FlyStep(desiredFacing);

3
OpenRA.Mods.Common/Activities/Air/Land.cs
View File

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