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

Fix blocked cursor for queued undeploy orders.

Browse Source
This commit is contained in:
Paul Chote
2019-06-20 20:19:23 +00:00
committed by reaperrr
parent 8f573568c8
commit 739f437c18
6 changed files with 55 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Common/Traits/Buildings/TransformsIntoPassenger.cs
View File

@@ -32,15 +32,19 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Require the force-move modifier to display the enter cursor.")]
public readonly bool RequiresForceMove = false;
public override object Create(ActorInitializer init) { return new TransformsIntoPassenger(this); }
public override object Create(ActorInitializer init) { return new TransformsIntoPassenger(init.Self, this); }
}
public class TransformsIntoPassenger : ConditionalTrait<TransformsIntoPassengerInfo>, IIssueOrder, IResolveOrder, IOrderVoice
{
readonly Actor self;
Transforms[] transforms;
public TransformsIntoPassenger(TransformsIntoPassengerInfo info)
: base(info) { }
public TransformsIntoPassenger(Actor self, TransformsIntoPassengerInfo info)
: base(info)
{
this.self = self;
}
protected override void Created(Actor self)
{
@@ -81,7 +85,7 @@ namespace OpenRA.Mods.Common.Traits
bool CanEnter(Actor target)
{
if (!transforms.Any(t => !t.IsTraitDisabled && !t.IsTraitPaused))
if (!(self.CurrentActivity is Transform || transforms.Any(t => !t.IsTraitDisabled && !t.IsTraitPaused)))
return false;
var cargo = target.TraitOrDefault<Cargo>();