Merge Plane and Helicopter into Aircraft

2015-08-06 18:33:52 +03:00
parent 0ee1ad3fa4
commit 8a44366667
28 changed files with 401 additions and 470 deletions
--- a/OpenRA.Mods.Common/Activities/Air/FlyTimed.cs
+++ b/OpenRA.Mods.Common/Activities/Air/FlyTimed.cs
@@ -10,20 +10,19 @@

 using OpenRA.Activities;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Traits;

 namespace OpenRA.Mods.Common.Activities
 {
 	public class FlyTimed : Activity
 	{
-		readonly Plane plane;
+		readonly Aircraft plane;
 		readonly WDist cruiseAltitude;
 		int remainingTicks;

 		public FlyTimed(int ticks, Actor self)
 		{
 			remainingTicks = ticks;
-			plane = self.Trait<Plane>();
+			plane = self.Trait<Aircraft>();
 			cruiseAltitude = plane.Info.CruiseAltitude;
 		}