Move Shroud.IsTargetable to Player.

This commit is contained in:
Paul Chote
2015-06-13 18:27:00 +01:00
parent 1eb1841f2b
commit 0677c309f3
7 changed files with 26 additions and 28 deletions

View File

@@ -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