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

Refactor Mobile.TeleportTo -> IMove.SetPosition

Browse Source
This commit is contained in:
Paul Chote
2010-06-23 21:09:42 +12:00
parent 3e664779ef
commit 37cf30a097
8 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.RA/Activities/Leap.cs
View File

@@ -19,6 +19,7 @@
#endregion
using OpenRA.Traits;
using System.Linq;
namespace OpenRA.Mods.RA.Activities
{
class Leap : IActivity
@@ -51,7 +52,7 @@ namespace OpenRA.Mods.RA.Activities
if (t >= 1f)
{
self.traits.Get<Mobile>().TeleportTo(self, target.Location);
self.traits.WithInterface<IMove>().FirstOrDefault().SetPosition(self, target.Location);
target.InflictDamage(self, target.Health, null); // kill it
return NextActivity;
}

4
OpenRA.Mods.RA/Activities/Teleport.cs
View File

@@ -18,6 +18,7 @@
*/
#endregion
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities
@@ -35,8 +36,7 @@ namespace OpenRA.Mods.RA.Activities
public IActivity Tick(Actor self)
{
var mobile = self.traits.Get<Mobile>();
mobile.TeleportTo(self, destination);
self.traits.WithInterface<IMove>().FirstOrDefault().SetPosition(self, destination);
return NextActivity;
}

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

@@ -78,7 +78,7 @@ namespace OpenRA.Mods.RA.Activities
self.World.AddFrameEndTask(w =>
{
w.Add(actor);
actor.traits.Get<Mobile>().TeleportTo(actor, self.Location);
actor.traits.WithInterface<IMove>().FirstOrDefault().SetPosition(actor, self.Location);
actor.CancelActivity();
actor.QueueActivity(new Move(exitTile.Value, 0));
});