From ef8b6b2e71b50d51b5b2e366b3bf67914160b5c3 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Thu, 23 Jun 2011 19:16:20 +1200
Subject: [PATCH] Remove FlyOffMap.Interruptable. Fixes #906.

---
 OpenRA.Mods.RA/Air/FlyTimed.cs     | 5 +----
 OpenRA.Mods.RA/Air/ReturnOnIdle.cs | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/OpenRA.Mods.RA/Air/FlyTimed.cs b/OpenRA.Mods.RA/Air/FlyTimed.cs
index ab4bb7c8fa..d202a04583 100755
--- a/OpenRA.Mods.RA/Air/FlyTimed.cs
+++ b/OpenRA.Mods.RA/Air/FlyTimed.cs
@@ -31,8 +31,6 @@ namespace OpenRA.Mods.RA.Air
 
 	public class FlyOffMap : Activity
 	{
-		public bool Interruptible = false;
-
 		public override Activity Tick(Actor self)
 		{
 			var targetAltitude = self.Info.Traits.Get<PlaneInfo>().CruiseAltitude;
@@ -45,8 +43,7 @@ namespace OpenRA.Mods.RA.Air
 
 		public override void Cancel( Actor self )
 		{
-			if (Interruptible)
-				base.Cancel(self);
+			base.Cancel(self);
 		}
 	}
 }
diff --git a/OpenRA.Mods.RA/Air/ReturnOnIdle.cs b/OpenRA.Mods.RA/Air/ReturnOnIdle.cs
index 04bc7639c9..288b8e2795 100755
--- a/OpenRA.Mods.RA/Air/ReturnOnIdle.cs
+++ b/OpenRA.Mods.RA/Air/ReturnOnIdle.cs
@@ -50,7 +50,7 @@ namespace OpenRA.Mods.RA.Air
                 if (someBuilding == null)
                 {
                     // ... going down the garden to eat worms ... 
-                    self.QueueActivity(new FlyOffMap() { Interruptible = true });
+                    self.QueueActivity(new FlyOffMap());
                     self.QueueActivity(new RemoveSelf());
                     return;
                 }
@@ -67,7 +67,7 @@ namespace OpenRA.Mods.RA.Air
 	{
 		public void TickIdle(Actor self)
 		{
-			self.QueueActivity(new FlyOffMap() { Interruptible = true });
+			self.QueueActivity(new FlyOffMap());
 			self.QueueActivity(new RemoveSelf());
 		}
 	}