From 1f92768193f84e8ea4c624d8aa01f725207a39c1 Mon Sep 17 00:00:00 2001
From: Scott_NZ <Scott_NZ>
Date: Fri, 30 Nov 2012 18:56:11 +1300
Subject: [PATCH] Remove FirstUnshroudedOrDefault from MissionUtils.cs

---
 OpenRA.Mods.RA/Missions/Allies03Script.cs | 9 +++++++--
 OpenRA.Mods.RA/Missions/MissionUtils.cs   | 5 -----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/OpenRA.Mods.RA/Missions/Allies03Script.cs b/OpenRA.Mods.RA/Missions/Allies03Script.cs
index 8a9d0d14a2..4e7d0af4c2 100644
--- a/OpenRA.Mods.RA/Missions/Allies03Script.cs
+++ b/OpenRA.Mods.RA/Missions/Allies03Script.cs
@@ -174,6 +174,11 @@ namespace OpenRA.Mods.RA.Missions
 			}
 		}
 
+		Actor FirstUnshroudedOrDefault(IEnumerable<Actor> actors, World world, int shroudRange)
+		{
+			return actors.FirstOrDefault(u => world.FindAliveCombatantActorsInCircle(u.CenterLocation, shroudRange).All(a => !a.HasTrait<CreatesShroud>()));
+		}
+
 		void ManageSovietAircraft()
 		{
 			var enemies = world.Actors
@@ -187,7 +192,7 @@ namespace OpenRA.Mods.RA.Missions
 				var ammo = aircraft.Trait<LimitedAmmo>();
 				if ((plane.Altitude == 0 && ammo.FullAmmo()) || (plane.Altitude != 0 && ammo.HasAmmo()))
 				{
-					var enemy = enemies.OrderBy(u => (aircraft.CenterLocation - u.CenterLocation).LengthSquared).FirstUnshroudedOrDefault(world, 10);
+					var enemy = FirstUnshroudedOrDefault(enemies.OrderBy(u => (aircraft.CenterLocation - u.CenterLocation).LengthSquared), world, 10);
 					if (enemy != null)
 					{
 						if (!aircraft.IsIdle && aircraft.GetCurrentActivity().GetType() != typeof(FlyAttack))
@@ -276,7 +281,7 @@ namespace OpenRA.Mods.RA.Missions
 				.Where(u => (u.Owner == allies1 || u.Owner == allies2)
 				&& ((u.HasTrait<Building>() && !u.HasTrait<Wall>()) || u.HasTrait<Mobile>()) && u.IsInWorld && !u.IsDead()
 				&& (!u.HasTrait<Spy>() || !u.Trait<Spy>().Disguised || (u.Trait<Spy>().Disguised && u.Trait<Spy>().disguisedAsPlayer != soviets)));
-			var enemy = enemies.OrderBy(u => (self.CenterLocation - u.CenterLocation).LengthSquared).FirstUnshroudedOrDefault(world, 10);
+			var enemy = FirstUnshroudedOrDefault(enemies.OrderBy(u => (self.CenterLocation - u.CenterLocation).LengthSquared), world, 10);
 			if (enemy != null)
 			{
 				self.QueueActivity(new AttackMove.AttackMoveActivity(self, new Attack(Target.FromActor(enemy), 3)));
diff --git a/OpenRA.Mods.RA/Missions/MissionUtils.cs b/OpenRA.Mods.RA/Missions/MissionUtils.cs
index e4e4c5dc7e..3c0e7391cc 100644
--- a/OpenRA.Mods.RA/Missions/MissionUtils.cs
+++ b/OpenRA.Mods.RA/Missions/MissionUtils.cs
@@ -100,11 +100,6 @@ namespace OpenRA.Mods.RA.Missions
 			badger.QueueActivity(new RemoveSelf());
 		}
 
-		public static Actor FirstUnshroudedOrDefault(this IEnumerable<Actor> actors, World world, int shroudRange)
-		{
-			return actors.FirstOrDefault(u => world.FindAliveCombatantActorsInCircle(u.CenterLocation, shroudRange).All(a => !a.HasTrait<CreatesShroud>()));
-		}
-
 		public static bool AreaSecuredWithUnits(World world, Player player, PPos location, int range)
 		{
 			var units = world.FindAliveCombatantActorsInCircle(location, range).Where(a => a.HasTrait<IMove>());