Fix HeliRTB and Aircraftto consider TurnToLand

This was previously ignored when a helicopter/VTOL was ordered directly or indirectly to ReturnToBase.
OpenRA · Nov 3, 2018 · 8f6d17a · 8f6d17a
1 parent 549e525
commit 8f6d17a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/OpenRA.Mods.Common/Activities/Air/HeliReturnToBase.cs b/OpenRA.Mods.Common/Activities/Air/HeliReturnToBase.cs
@@ -106,7 +106,9 @@ public override Activity Tick(Actor self)
 			{
 				aircraft.MakeReservation(dest);
 
-				landingProcedures.Add(new Turn(self, initialFacing));
+				if (aircraft.Info.TurnToLand)
+					landingProcedures.Add(new Turn(self, initialFacing));
+
 				landingProcedures.Add(new HeliLand(self, false));
 				landingProcedures.Add(new ResupplyAircraft(self));
 				if (!abortOnResupply)

diff --git a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs
@@ -752,7 +752,9 @@ public void ResolveOrder(Actor self, Order order)
 							var offset = exit != null ? exit.Info.SpawnOffset : WVec.Zero;
 
 							self.QueueActivity(new HeliFly(self, Target.FromPos(targetActor.CenterPosition + offset)));
-							self.QueueActivity(new Turn(self, Info.InitialFacing));
+							if (Info.TurnToLand)
+								self.QueueActivity(new Turn(self, Info.InitialFacing));
+
 							self.QueueActivity(new HeliLand(self, false));
 							self.QueueActivity(new ResupplyAircraft(self));
 						};