AreaBeam Facing -> WAngle.

This commit is contained in:
Paul Chote
2020-05-30 21:07:01 +01:00
committed by reaperrr
parent 2cfacc2c7d
commit a93aea3e4e

View File

@@ -93,7 +93,7 @@ namespace OpenRA.Mods.Common.Projectiles
WPos target; WPos target;
int length; int length;
int towardsTargetFacing; WAngle towardsTargetFacing;
int headTicks; int headTicks;
int tailTicks; int tailTicks;
bool isHeadTravelling = true; bool isHeadTravelling = true;
@@ -133,11 +133,11 @@ namespace OpenRA.Mods.Common.Projectiles
target += WVec.FromPDF(world.SharedRandom, 2) * maxOffset / 1024; target += WVec.FromPDF(world.SharedRandom, 2) * maxOffset / 1024;
} }
towardsTargetFacing = (target - headPos).Yaw.Facing; towardsTargetFacing = (target - headPos).Yaw;
// Update the target position with the range we shoot beyond the target by // Update the target position with the range we shoot beyond the target by
// I.e. we can deliberately overshoot, so aim for that position // I.e. we can deliberately overshoot, so aim for that position
var dir = new WVec(0, -1024, 0).Rotate(WRot.FromFacing(towardsTargetFacing)); var dir = new WVec(0, -1024, 0).Rotate(WRot.FromYaw(towardsTargetFacing));
target += dir * info.BeyondTargetRange.Length / 1024; target += dir * info.BeyondTargetRange.Length / 1024;
length = Math.Max((target - headPos).Length / speed.Length, 1); length = Math.Max((target - headPos).Length / speed.Length, 1);
@@ -160,11 +160,11 @@ namespace OpenRA.Mods.Common.Projectiles
else else
{ {
target = guidedTargetPos; target = guidedTargetPos;
towardsTargetFacing = (target - args.Source).Yaw.Facing; towardsTargetFacing = (target - args.Source).Yaw;
// Update the target position with the range we shoot beyond the target by // Update the target position with the range we shoot beyond the target by
// I.e. we can deliberately overshoot, so aim for that position // I.e. we can deliberately overshoot, so aim for that position
var dir = new WVec(0, -1024, 0).Rotate(WRot.FromFacing(towardsTargetFacing)); var dir = new WVec(0, -1024, 0).Rotate(WRot.FromYaw(towardsTargetFacing));
target += dir * info.BeyondTargetRange.Length / 1024; target += dir * info.BeyondTargetRange.Length / 1024;
} }
} }