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

Unhack movement check in ChronoshiftDeploy (well, hide the hack under another layer of abstraction, at least)

Browse Source
This commit is contained in:
Paul Chote
2009-12-21 20:09:19 -08:00
parent bd138fcf0f
commit 420012f8d9
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRa.Game/Traits/ChronoshiftDeploy.cs
View File

@@ -1,5 +1,7 @@
using OpenRa.Game.GameRules; using OpenRa.Game.GameRules;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
namespace OpenRa.Game.Traits namespace OpenRa.Game.Traits
{ {
class ChronoshiftDeploy : IOrder, ISpeedModifier, ITick, IPips class ChronoshiftDeploy : IOrder, ISpeedModifier, ITick, IPips
@@ -30,13 +32,14 @@ namespace OpenRa.Game.Traits
public void ResolveOrder(Actor self, Order order) public void ResolveOrder(Actor self, Order order)
{ {
var movement = self.traits.WithInterface<IMovement>().FirstOrDefault();
if (order.OrderString == "ActivatePortableChronoshift" && remainingChargeTime <= 0) if (order.OrderString == "ActivatePortableChronoshift" && remainingChargeTime <= 0)
{ {
chronoshiftActive = true; chronoshiftActive = true;
self.CancelActivity(); self.CancelActivity();
} }
if (order.OrderString == "UsePortableChronoshift" && Game.IsCellBuildable(order.TargetLocation, self.Info.WaterBound ? UnitMovementType.Float : UnitMovementType.Wheel, self)) if (order.OrderString == "UsePortableChronoshift" && movement.CanEnterCell(order.TargetLocation))
{ {
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(new Activities.Teleport(order.TargetLocation)); self.QueueActivity(new Activities.Teleport(order.TargetLocation));