Move Shroud.IsTargetable to Player.

OpenRA.Game/Player.cs

@@ -49,6 +49,8 @@ namespace OpenRA
 		public Shroud Shroud;
 		public World World { get; private set; }
 
+		readonly IFogVisibilityModifier[] fogVisibilities;
+
 		CountryInfo ChooseCountry(World world, string name, bool requireSelectable = true)
 		{
 			var selectableCountries = world.Map.Rules.Actors["world"].Traits
@@ -113,6 +115,9 @@ namespace OpenRA
 			PlayerActor = world.CreateActor("Player", new TypeDictionary { new OwnerInit(this) });
 			Shroud = PlayerActor.Trait<Shroud>();
 
+			fogVisibilities = PlayerActor.TraitsImplementing<IFogVisibilityModifier>()
+				.ToArray();
+
 			// Enable the bot logic on the host
 			IsBot = botType != null;
 			if (IsBot && Game.IsHost)
@@ -157,6 +162,19 @@ namespace OpenRA
 			return a.Trait<IDefaultVisibility>().IsVisible(a, this);
 		}
 
+		public bool CanTargetActor(Actor a)
+		{
+			if (HasFogVisibility)
+				return true;
+
+			if (a.TraitsImplementing<IVisibilityModifier>().Any(t => !t.IsVisible(a, this)))
+				return false;
+
+			return a.Trait<IDefaultVisibility>().IsVisible(a, this);
+		}
+
+		public bool HasFogVisibility { get { return fogVisibilities.Any(f => f.HasFogVisibility(this)); } }
+
 		#region Scripting interface
 
 		Lazy<ScriptPlayerInterface> luaInterface;

OpenRA.Game/Traits/World/Shroud.cs

@@ -33,8 +33,6 @@ namespace OpenRA.Traits
 		readonly CellLayer<short> generatedShroudCount;
 		readonly CellLayer<bool> explored;
 
-		readonly Lazy<IFogVisibilityModifier[]> fogVisibilities;
-
 		// Cache of visibility that was added, so no matter what crazy trait code does, it
 		// can't make us invalid.
 		readonly Dictionary<Actor, CPos[]> visibility = new Dictionary<Actor, CPos[]>();
@@ -62,8 +60,6 @@ namespace OpenRA.Traits
 			self.World.ActorAdded += a => { CPos[] shrouded = null; AddShroudGeneration(a, ref shrouded); };
 			self.World.ActorRemoved += RemoveShroudGeneration;
 
-			fogVisibilities = Exts.Lazy(() => self.TraitsImplementing<IFogVisibilityModifier>().ToArray());
-
 			shroudEdgeTest = map.Contains;
 			isExploredTest = IsExploredCore;
 			isVisibleTest = IsVisibleCore;
@@ -389,22 +385,6 @@ namespace OpenRA.Traits
 			}
 		}
 
-		public bool IsTargetable(Actor a)
-		{
-			if (HasFogVisibility())
-				return true;
-
-			if (a.TraitsImplementing<IVisibilityModifier>().Any(t => !t.IsVisible(a, self.Owner)))
-				return false;
-
-			return GetVisOrigins(a).Any(IsVisible);
-		}
-
-		public bool HasFogVisibility()
-		{
-			return fogVisibilities.Value.Any(f => f.HasFogVisibility(self.Owner));
-		}
-
 		public bool Contains(MPos uv)
 		{
 			// Check that uv is inside the map area. There is nothing special