Merge HeliFly into Fly

2019-05-01 15:45:10 +02:00
parent 5698ea0910
commit 4f8f8cfb9d
14 changed files with 129 additions and 243 deletions
--- a/OpenRA.Mods.Common/Activities/Air/FlyCircle.cs
+++ b/OpenRA.Mods.Common/Activities/Air/FlyCircle.cs
@@ -47,7 +47,11 @@ namespace OpenRA.Mods.Common.Activities

 			// We can't possibly turn this fast
 			var desiredFacing = aircraft.Facing + 64;
-			Fly.FlyToward(self, aircraft, desiredFacing, aircraft.Info.CruiseAltitude, turnSpeedOverride);
+
+			// This override is necessary, otherwise CanHover aircraft would circle sideways
+			var move = aircraft.FlyStep(aircraft.Facing);
+
+			Fly.FlyTick(self, aircraft, desiredFacing, aircraft.Info.CruiseAltitude, move, turnSpeedOverride);

 			return this;
 		}