From af4093f3803febabd53d70def66fed222a1c5c73 Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Tue, 21 Jun 2011 14:19:11 +1200
Subject: [PATCH] Swap the default value for FlyOffMap.Interruptible. The
 common case (scripted aircraft) don't want to be interruptible. Fixes badr
 desync caused by the mono 2.6.7 compiler dropping initializers for bools that
 default to true.

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

diff --git a/OpenRA.Mods.RA/Air/FlyTimed.cs b/OpenRA.Mods.RA/Air/FlyTimed.cs
index 02fca8351c..ab4bb7c8fa 100755
--- a/OpenRA.Mods.RA/Air/FlyTimed.cs
+++ b/OpenRA.Mods.RA/Air/FlyTimed.cs
@@ -31,7 +31,7 @@ namespace OpenRA.Mods.RA.Air
 
 	public class FlyOffMap : Activity
 	{
-		public bool Interruptible = true;
+		public bool Interruptible = false;
 
 		public override Activity Tick(Actor self)
 		{
diff --git a/OpenRA.Mods.RA/Air/ReturnOnIdle.cs b/OpenRA.Mods.RA/Air/ReturnOnIdle.cs
index 288b8e2795..04bc7639c9 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());
+                    self.QueueActivity(new FlyOffMap() { Interruptible = true });
                     self.QueueActivity(new RemoveSelf());
                     return;
                 }
@@ -67,7 +67,7 @@ namespace OpenRA.Mods.RA.Air
 	{
 		public void TickIdle(Actor self)
 		{
-			self.QueueActivity(new FlyOffMap());
+			self.QueueActivity(new FlyOffMap() { Interruptible = true });
 			self.QueueActivity(new RemoveSelf());
 		}
 	}
diff --git a/OpenRA.Mods.RA/ParaDrop.cs b/OpenRA.Mods.RA/ParaDrop.cs
index ea80ae4753..4518aeb460 100644
--- a/OpenRA.Mods.RA/ParaDrop.cs
+++ b/OpenRA.Mods.RA/ParaDrop.cs
@@ -72,7 +72,7 @@ namespace OpenRA.Mods.RA
 		void FinishedDropping(Actor self)
 		{
 			self.CancelActivity();
-			self.QueueActivity(new FlyOffMap { Interruptible = false });
+			self.QueueActivity(new FlyOffMap());
 			self.QueueActivity(new RemoveSelf());
 		}
 	}
diff --git a/OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs b/OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs
index babbca5886..b2e8a120de 100755
--- a/OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs
+++ b/OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs
@@ -63,7 +63,7 @@ namespace OpenRA.Mods.RA
 				if (flare != null)
 					a.QueueActivity(new CallFunc(() => flare.Destroy()));
 
-				a.QueueActivity(new FlyOffMap { Interruptible = false });
+				a.QueueActivity(new FlyOffMap());
 				a.QueueActivity(new RemoveSelf());
 			});
 		}
diff --git a/OpenRA.Mods.RA/SupportPowers/SpyPlanePower.cs b/OpenRA.Mods.RA/SupportPowers/SpyPlanePower.cs
index 9b53f82d02..77e75a3fb0 100755
--- a/OpenRA.Mods.RA/SupportPowers/SpyPlanePower.cs
+++ b/OpenRA.Mods.RA/SupportPowers/SpyPlanePower.cs
@@ -52,7 +52,7 @@ namespace OpenRA.Mods.RA
 					camera.QueueActivity(new Wait(25 * (Info as SpyPlanePowerInfo).RevealTime));
 					camera.QueueActivity(new RemoveSelf());
 				})));
-			plane.QueueActivity(new FlyOffMap { Interruptible = false });
+			plane.QueueActivity(new FlyOffMap());
 			plane.QueueActivity(new RemoveSelf());
 		}
 	}