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/FlyOffMap.cs
+++ b/OpenRA.Mods.Common/Activities/Air/FlyOffMap.cs
@@ -10,17 +10,16 @@

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

 namespace OpenRA.Mods.Common.Activities
 {
 	public class FlyOffMap : Activity
 	{
-		readonly Plane plane;
+		readonly Aircraft plane;

 		public FlyOffMap(Actor self)
 		{
-			plane = self.Trait<Plane>();
+			plane = self.Trait<Aircraft>();
 		}

 		public override Activity Tick(Actor self)