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

Fix Move not cancelling during turns.

Browse Source
This commit is contained in:
tovl
2019-08-23 21:50:57 +02:00
committed by teinarss
parent 8b0f2e1462
commit 946c9f420b
1 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,6 +259,14 @@ namespace OpenRA.Mods.Common.Activities
return Pair.New(nextCell, subCell); return Pair.New(nextCell, subCell);
} }
public override void Cancel(Actor self, bool keepQueue = false)
{
if (path != null)
path.Clear();
base.Cancel(self, keepQueue);
}
public override IEnumerable<Target> GetTargets(Actor self) public override IEnumerable<Target> GetTargets(Actor self)
{ {
if (path != null) if (path != null)
@@ -401,29 +409,26 @@ namespace OpenRA.Mods.Common.Activities
var fromSubcellOffset = map.Grid.OffsetOfSubCell(mobile.FromSubCell); var fromSubcellOffset = map.Grid.OffsetOfSubCell(mobile.FromSubCell);
var toSubcellOffset = map.Grid.OffsetOfSubCell(mobile.ToSubCell); var toSubcellOffset = map.Grid.OffsetOfSubCell(mobile.ToSubCell);
if (!IsCanceling || self.Location.Layer == CustomMovementLayerType.Tunnel) var nextCell = parent.PopPath(self);
if (nextCell != null)
{ {
var nextCell = parent.PopPath(self); if (IsTurn(mobile, nextCell.Value.First))
if (nextCell != null)
{ {
if (IsTurn(mobile, nextCell.Value.First)) var nextSubcellOffset = map.Grid.OffsetOfSubCell(nextCell.Value.Second);
{ var ret = new MoveFirstHalf(
var nextSubcellOffset = map.Grid.OffsetOfSubCell(nextCell.Value.Second); Move,
var ret = new MoveFirstHalf( Util.BetweenCells(self.World, mobile.FromCell, mobile.ToCell) + (fromSubcellOffset + toSubcellOffset) / 2,
Move, Util.BetweenCells(self.World, mobile.ToCell, nextCell.Value.First) + (toSubcellOffset + nextSubcellOffset) / 2,
Util.BetweenCells(self.World, mobile.FromCell, mobile.ToCell) + (fromSubcellOffset + toSubcellOffset) / 2, mobile.Facing,
Util.BetweenCells(self.World, mobile.ToCell, nextCell.Value.First) + (toSubcellOffset + nextSubcellOffset) / 2, Util.GetNearestFacing(mobile.Facing, map.FacingBetween(mobile.ToCell, nextCell.Value.First, mobile.Facing)),
mobile.Facing, moveFraction - MoveFractionTotal);
Util.GetNearestFacing(mobile.Facing, map.FacingBetween(mobile.ToCell, nextCell.Value.First, mobile.Facing)),
moveFraction - MoveFractionTotal);
mobile.FinishedMoving(self); mobile.FinishedMoving(self);
mobile.SetLocation(mobile.ToCell, mobile.ToSubCell, nextCell.Value.First, nextCell.Value.Second); mobile.SetLocation(mobile.ToCell, mobile.ToSubCell, nextCell.Value.First, nextCell.Value.Second);
return ret; return ret;
}
parent.path.Add(nextCell.Value.First);
} }
parent.path.Add(nextCell.Value.First);
} }
var toPos = mobile.ToCell.Layer == 0 ? map.CenterOfCell(mobile.ToCell) : var toPos = mobile.ToCell.Layer == 0 ? map.CenterOfCell(mobile.ToCell) :