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

Fix units warping to 0,0 when doing a 180 degree turn.

Browse Source
This commit is contained in:
Paul Chote
2017-01-14 23:51:19 +00:00
parent 85630501e1
commit 22fad046a0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Activities/Move/Move.cs
View File

@@ -297,6 +297,7 @@ namespace OpenRA.Mods.Common.Activities
protected readonly Move Move;
protected readonly WPos From, To;
protected readonly int FromFacing, ToFacing;
protected readonly bool EnableArc;
protected readonly WPos ArcCenter;
protected readonly int ArcFromLength;
protected readonly WAngle ArcFromAngle;
@@ -333,6 +334,7 @@ namespace OpenRA.Mods.Common.Activities
ArcFromAngle = (ArcCenter - from).Yaw;
ArcToLength = (ArcCenter - to).HorizontalLength;
ArcToAngle = (ArcCenter - to).Yaw;
EnableArc = true;
}
}
@@ -378,7 +380,7 @@ namespace OpenRA.Mods.Common.Activities
if (MoveFractionTotal != 0)
{
WPos pos;
if (FromFacing != ToFacing)
if (EnableArc)
{
var angle = WAngle.Lerp(ArcFromAngle, ArcToAngle, moveFraction, MoveFractionTotal);
var length = int2.Lerp(ArcFromLength, ArcToLength, moveFraction, MoveFractionTotal);