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

Rewrite Mobile.MoveIntoTarget to support moving targets.

Browse Source
This commit is contained in:
Paul Chote
2019-01-31 20:30:34 +00:00
committed by Oliver Brakmann
parent 1f7b558b29
commit d2274f4285
4 changed files with 103 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -205,7 +205,7 @@ namespace OpenRA.Mods.Common.Activities
isEnteringOrInside = true;
savedPos = self.CenterPosition; // Save position of self, before entering, for returning on exit
inner = move.MoveIntoTarget(self, target); // Enter
inner = move.VisualMove(self, self.CenterPosition, target.Positions.PositionClosestTo(self.CenterPosition));
if (inner != null)
{
@@ -228,7 +228,7 @@ namespace OpenRA.Mods.Common.Activities
Unreserve(self, false);
if (Reserve(self) == ReserveStatus.Ready)
{
inner = move.MoveIntoTarget(self, target); // Enter
inner = move.VisualMove(self, self.CenterPosition, target.Positions.PositionClosestTo(self.CenterPosition));
if (inner != null)
return EnterState.ApproachingOrEntering;