fb1f8c4e01
1. TakeOff's Tick() method never checks itself whether it is canceled 2. If NextActivity is null, TakeOff is the only activity on the queue 3. Takeoff canceling the queue then just cancels itself, with no effect at all 4. If Takeoff however is running as an inner activity, it will cancel the complete main queue, wrecking all sorts of havoc
47 lines
1.2 KiB
C#
47 lines
1.2 KiB
C#
#region Copyright & License Information
|
|
/*
|
|
* Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
|
|
* This file is part of OpenRA, which is free software. It is made
|
|
* available to you under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation, either version 3 of
|
|
* the License, or (at your option) any later version. For more
|
|
* information, see COPYING.
|
|
*/
|
|
#endregion
|
|
|
|
using OpenRA.Activities;
|
|
using OpenRA.Mods.Common.Traits;
|
|
using OpenRA.Traits;
|
|
|
|
namespace OpenRA.Mods.Common.Activities
|
|
{
|
|
public class TakeOff : Activity
|
|
{
|
|
readonly Aircraft aircraft;
|
|
readonly IMove move;
|
|
|
|
public TakeOff(Actor self)
|
|
{
|
|
aircraft = self.Trait<Aircraft>();
|
|
move = self.Trait<IMove>();
|
|
}
|
|
|
|
public override Activity Tick(Actor self)
|
|
{
|
|
aircraft.UnReserve();
|
|
|
|
var host = aircraft.GetActorBelow();
|
|
var hasHost = host != null;
|
|
var rp = hasHost ? host.TraitOrDefault<RallyPoint>() : null;
|
|
|
|
var destination = rp != null ? rp.Location :
|
|
(hasHost ? self.World.Map.CellContaining(host.CenterPosition) : self.Location);
|
|
|
|
if (NextActivity == null)
|
|
return new AttackMoveActivity(self, move.MoveTo(destination, 1));
|
|
else
|
|
return NextActivity;
|
|
}
|
|
}
|
|
}
|