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

Convert Drag to world coords.

Browse Source
This commit is contained in:
Paul Chote
2013-07-06 19:55:16 +12:00
parent 7f25573cfa
commit 0fdffd7b6a
8 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,9 +35,9 @@ namespace OpenRA.Mods.RA.Activities
// Move to the middle of the target, ignoring impassable tiles
var mobile = self.Trait<Mobile>();
var to = target.CenterLocation;
var from = self.CenterLocation;
var speed = mobile.MovementSpeedForCell(self, self.Location);
var to = target.CenterPosition;
var from = self.CenterPosition;
var speed = mobile.WorldMovementSpeedForCell(self, self.Location);
var length = speed > 0 ? (int)((to - from).Length * 3 / speed) : 0;
return Util.SequenceActivities(

17
OpenRA.Mods.RA/Activities/UnloadCargo.cs
View File

@@ -79,23 +79,24 @@ namespace OpenRA.Mods.RA.Activities
return this;
var actor = cargo.Unload(self);
var exitPx = Util.CenterOfCell(exitTile.Value);
var currentPx = Util.CenterOfCell(self.Location);
var exit = exitTile.Value.CenterPosition;
var current = self.Location.CenterPosition;
self.World.AddFrameEndTask(w =>
{
if (actor.Destroyed) return;
if (actor.Destroyed)
return;
var mobile = actor.Trait<Mobile>();
mobile.Facing = Util.GetFacing( (exitPx - currentPx).ToInt2(), mobile.Facing );
mobile.Facing = Util.GetFacing(exit - current, mobile.Facing );
mobile.SetPosition(actor, exitTile.Value);
mobile.AdjustPxPosition(actor, currentPx);
var speed = mobile.MovementSpeedForCell(actor, exitTile.Value);
var length = speed > 0 ? ((int)(exitPx - currentPx).Length * 3 / speed) : 0;
mobile.AdjustPxPosition(actor, PPos.FromWPos(current));
var speed = mobile.WorldMovementSpeedForCell(actor, exitTile.Value);
var length = speed > 0 ? ((int)(exit - current).Length * 3 / speed) : 0;
w.Add(actor);
actor.CancelActivity();
actor.QueueActivity(new Drag(currentPx, exitPx, length));
actor.QueueActivity(new Drag(current, exit, length));
actor.QueueActivity(mobile.MoveTo(exitTile.Value, 0));
var rallyPoint = ChooseRallyPoint(actor).Value;