e2dd967757
- TakeOff.Tick was nulling a local variable, rather than the Reservation field - this is changed to call UnReserve which does the right thing. - Aircraft.ResolveOrder was missing an UnReserve call before setting a new reservation.
49 lines
1.2 KiB
C#
49 lines
1.2 KiB
C#
#region Copyright & License Information
|
|
/*
|
|
* Copyright 2007-2015 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. 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)
|
|
{
|
|
if (NextActivity == null)
|
|
self.CancelActivity();
|
|
|
|
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;
|
|
}
|
|
}
|
|
}
|