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

Use MoveIntoWorld for Enter activities.

Browse Source
This commit is contained in:
Paul Chote
2014-03-19 13:40:17 +13:00
parent 8b3b894fc5
commit 262e0fc484
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Mods.RA/Activities/Enter.cs
View File

@@ -37,18 +37,11 @@ namespace OpenRA.Mods.RA.Activities
return Util.SequenceActivities(new MoveAdjacentTo(self, target), this);
// Move to the middle of the target, ignoring impassable tiles
var mobile = self.Trait<Mobile>();
var to = target.CenterPosition;
var from = self.CenterPosition;
var speed = mobile.MovementSpeedForCell(self, self.Location);
var length = speed > 0 ? (to - from).Length / speed : 0;
var move = self.Trait<IMove>();
return Util.SequenceActivities(
new Turn(Util.GetFacing(to - from, mobile.Facing)),
new Drag(from, to, length),
move.VisualMove(self, self.CenterPosition, target.CenterPosition),
inner,
new Turn(Util.GetFacing(from - to, mobile.Facing)),
new Drag(to, from, length),
move.VisualMove(self, target.CenterPosition, self.CenterPosition),
NextActivity
);
}