57143087d7
Occupied cells was defined by height yet we didn't update actor map on changing height. This in some scenarios could have caused the aircraft to forget to remove its influence from actor map
74 lines
1.9 KiB
C#
74 lines
1.9 KiB
C#
#region Copyright & License Information
|
|
/*
|
|
* Copyright 2007-2022 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;
|
|
|
|
namespace OpenRA.Mods.Common.Activities
|
|
{
|
|
public class TakeOff : Activity
|
|
{
|
|
readonly Aircraft aircraft;
|
|
|
|
public TakeOff(Actor self)
|
|
{
|
|
aircraft = self.Trait<Aircraft>();
|
|
}
|
|
|
|
protected override void OnFirstRun(Actor self)
|
|
{
|
|
if (aircraft.ForceLanding)
|
|
return;
|
|
|
|
if (!aircraft.HasInfluence())
|
|
return;
|
|
|
|
// We are taking off, so remove influence in ground cells.
|
|
aircraft.RemoveInfluence();
|
|
|
|
if (self.World.Map.DistanceAboveTerrain(aircraft.CenterPosition).Length > aircraft.Info.MinAirborneAltitude)
|
|
return;
|
|
|
|
if (aircraft.Info.TakeoffSounds.Length > 0)
|
|
Game.Sound.Play(SoundType.World, aircraft.Info.TakeoffSounds, self.World, aircraft.CenterPosition);
|
|
|
|
foreach (var notify in self.TraitsImplementing<INotifyTakeOff>())
|
|
notify.TakeOff(self);
|
|
}
|
|
|
|
public override bool Tick(Actor self)
|
|
{
|
|
// Refuse to take off if it would land immediately again.
|
|
if (aircraft.ForceLanding)
|
|
{
|
|
Cancel(self);
|
|
return true;
|
|
}
|
|
|
|
var dat = self.World.Map.DistanceAboveTerrain(aircraft.CenterPosition);
|
|
if (dat < aircraft.Info.CruiseAltitude)
|
|
{
|
|
// If we're a VTOL, rise before flying forward
|
|
if (aircraft.Info.VTOL)
|
|
{
|
|
Fly.VerticalTakeOffOrLandTick(self, aircraft, aircraft.Facing, aircraft.Info.CruiseAltitude);
|
|
return false;
|
|
}
|
|
|
|
Fly.FlyTick(self, aircraft, aircraft.Facing, aircraft.Info.CruiseAltitude);
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
}
|
|
}
|