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

6
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -169,13 +169,11 @@ namespace OpenRA.Mods.Common.Traits
public void Repulse()
{
var repulsionForce = GetRepulsionForce();
var repulsionFacing = Util.GetFacing(repulsionForce, -1);
if (repulsionFacing == -1)
if (repulsionForce.HorizontalLengthSquared == 0)
return;
var speed = Info.RepulsionSpeed != -1 ? Info.RepulsionSpeed : MovementSpeed;
SetPosition(self, CenterPosition + FlyStep(speed, repulsionFacing));
SetPosition(self, CenterPosition + FlyStep(speed, repulsionForce.Yaw.Facing));
}
public virtual WVec GetRepulsionForce()

3
OpenRA.Mods.Common/Traits/Air/AttackBomber.cs
View File

@@ -54,7 +54,8 @@ namespace OpenRA.Mods.Common.Traits
inAttackRange = false;
var f = facing.Value.Facing;
var facingToTarget = Util.GetFacing(target.CenterPosition - self.CenterPosition, f);
var delta = target.CenterPosition - self.CenterPosition;
var facingToTarget = delta.HorizontalLengthSquared != 0 ? delta.Yaw.Facing : f;
facingTarget = Math.Abs(facingToTarget - f) % 256 <= info.FacingTolerance;
// Bombs drop anywhere in range

3
OpenRA.Mods.Common/Traits/Attack/AttackFrontal.cs
View File

@@ -38,7 +38,8 @@ namespace OpenRA.Mods.Common.Traits
return false;
var f = facing.Value.Facing;
var facingToTarget = Util.GetFacing(target.CenterPosition - self.CenterPosition, f);
var delta = target.CenterPosition - self.CenterPosition;
var facingToTarget = delta.HorizontalLengthSquared != 0 ? delta.Yaw.Facing : f;
if (Math.Abs(facingToTarget - f) % 256 > info.FacingTolerance)
return false;

2
OpenRA.Mods.Common/Traits/Attack/AttackGarrisoned.cs
View File

@@ -140,7 +140,7 @@ namespace OpenRA.Mods.Common.Traits
return;
var pos = self.CenterPosition;
var targetYaw = WAngle.FromFacing(OpenRA.Traits.Util.GetFacing(target.CenterPosition - self.CenterPosition, 0));
var targetYaw = (target.CenterPosition - self.CenterPosition).Yaw;
foreach (var a in Armaments)
{

3
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -796,7 +796,8 @@ namespace OpenRA.Mods.Common.Traits
var speed = MovementSpeedForCell(self, cell);
var length = speed > 0 ? (toPos - fromPos).Length / speed : 0;
var facing = Util.GetFacing(toPos - fromPos, Facing);
var delta = toPos - fromPos;
var facing = delta.HorizontalLengthSquared != 0 ? delta.Yaw.Facing : Facing;
return Util.SequenceActivities(new Turn(self, facing), new Drag(self, fromPos, toPos, length));
}

14
OpenRA.Mods.Common/Traits/Production.cs
View File

@@ -63,8 +63,18 @@ namespace OpenRA.Mods.Common.Traits
var spawn = self.CenterPosition + exitinfo.SpawnOffset;
var to = self.World.Map.CenterOfCell(exit);
var fi = producee.TraitInfoOrDefault<IFacingInfo>();
var initialFacing = exitinfo.Facing < 0 ? Util.GetFacing(to - spawn, fi == null ? 0 : fi.GetInitialFacing()) : exitinfo.Facing;
var initialFacing = exitinfo.Facing;
if (exitinfo.Facing < 0)
{
var delta = to - spawn;
if (delta.HorizontalLengthSquared == 0)
{
var fi = producee.TraitInfoOrDefault<IFacingInfo>();
initialFacing = fi != null ? fi.GetInitialFacing() : 0;
}
else
initialFacing = delta.Yaw.Facing;
}
exitLocation = rp.Value != null ? rp.Value.Location : exit;
target = Target.FromCell(self.World, exitLocation);

3
OpenRA.Mods.Common/Traits/Turreted.cs
View File

@@ -110,7 +110,8 @@ namespace OpenRA.Mods.Common.Traits
public bool FaceTarget(Actor self, Target target)
{
DesiredFacing = Util.GetFacing(target.CenterPosition - self.CenterPosition, TurretFacing);
var delta = target.CenterPosition - self.CenterPosition;
DesiredFacing = delta.HorizontalLengthSquared != 0 ? delta.Yaw.Facing : TurretFacing;
MoveTurret();
return TurretFacing == DesiredFacing.Value;
}