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

Fix for #6161 queue commands for Plane/Heli (do not ignore Order.Queued in ResolveOrder())

Browse Source
This commit is contained in:
atimoschenkow
2015-08-02 12:29:35 +02:00
parent 0efb8fc6f4
commit b1c51cc910
5 changed files with 89 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Activities/Air/TakeOff.cs
View File

@@ -27,7 +27,8 @@ namespace OpenRA.Mods.Common.Activities
public override Activity Tick(Actor self)
{
self.CancelActivity();
if (NextActivity == null)
self.CancelActivity();
var reservation = aircraft.Reservation;
if (reservation != null)
@@ -43,7 +44,10 @@ namespace OpenRA.Mods.Common.Activities
var destination = rp != null ? rp.Location :
(hasHost ? self.World.Map.CellContaining(host.CenterPosition) : self.Location);
return new AttackMoveActivity(self, move.MoveTo(destination, 1));
if (NextActivity == null)
return new AttackMoveActivity(self, move.MoveTo(destination, 1));
else
return NextActivity;
}
}
}