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

Remove HeliFlyCircle activity

Browse Source 
FlyCircle actually works fine for D2k Carryalls,
and no other place used this.
This commit is contained in:
reaperrr
2019-05-01 13:00:49 +02:00
committed by Paul Chote
parent 77d890848b
commit ad4c0e6dee
3 changed files with 3 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -619,11 +619,11 @@ namespace OpenRA.Mods.Common.Traits
self.QueueActivity(new FlyCircle(self, -1, Info.IdleTurnSpeed > -1 ? Info.IdleTurnSpeed : TurnSpeed));
else if (atLandAltitude && !CanLand(self.Location) && ReservedActor == null)
self.QueueActivity(new TakeOff(self));
else if (Info.CanHover && self.Info.HasTraitInfo<AutoCarryallInfo>() && Info.IdleTurnSpeed > -1)
else if (Info.CanHover && Info.IdleTurnSpeed > 0)
{
// Temporary HACK for the AutoCarryall special case (needs CanHover, but also HeliFlyCircle on idle).
// Temporary HACK for the AutoCarryall special case (needs CanHover, but also FlyCircle on idle).
// Will go away soon (in a separate PR) with the arrival of ActionsWhenIdle.
self.QueueActivity(new HeliFlyCircle(self, Info.IdleTurnSpeed > -1 ? Info.IdleTurnSpeed : TurnSpeed));
self.QueueActivity(new FlyCircle(self, -1, Info.IdleTurnSpeed > -1 ? Info.IdleTurnSpeed : TurnSpeed));
}
}