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

Clean up usage of CancelActivity.

Browse Source
This commit is contained in:
tovl
2019-08-31 16:47:12 +02:00
committed by reaperrr
parent 1e786b8e31
commit ac6431acf8
22 changed files with 24 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -354,8 +354,7 @@ namespace OpenRA.Mods.Common.Traits
if (!ForceLanding && landNow.HasValue && landNow.Value && airborne && CanLand(self.Location)
&& !((self.CurrentActivity is Land) || self.CurrentActivity is Turn))
{
self.CancelActivity();
self.QueueActivity(new Land(self));
self.QueueActivity(false, new Land(self));
ForceLanding = true;
}
@@ -365,10 +364,7 @@ namespace OpenRA.Mods.Common.Traits
ForceLanding = false;
if (Info.IdleBehavior != IdleBehaviorType.Land)
{
self.CancelActivity();
self.QueueActivity(new TakeOff(self));
}
self.QueueActivity(false, new TakeOff(self));
}
var oldCachedFacing = cachedFacing;