epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweak visibility; hopefully allows targeting of detected units

Browse Source
This commit is contained in:
Paul Chote
2010-08-15 05:43:00 +12:00
parent 7f191887ec
commit 230d59f655
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.RA/Modifiers/FrozenUnderFog.cs
View File

@@ -29,17 +29,17 @@ namespace OpenRA.Mods.RA
shroud = self.World.WorldActor.Trait<Shroud>();
}
public bool IsVisible(Actor self)
public bool IsVisible(Actor self, Player byPlayer)
{
return self.World.LocalPlayer == null
|| self.Owner == self.World.LocalPlayer
|| self.Owner == byPlayer
|| self.World.LocalPlayer.Shroud.Disabled
|| Shroud.GetVisOrigins(self).Any(o => self.World.Map.IsInMap(o) && shroud.visibleCells[o.X, o.Y] != 0);
}
public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)
{
if (IsVisible(self))
if (IsVisible(self, self.World.LocalPlayer))
cache = r.ToArray();
return cache;

6
OpenRA.Mods.RA/Modifiers/HiddenUnderFog.cs
View File

@@ -27,10 +27,10 @@ namespace OpenRA.Mods.RA
shroud = self.World.WorldActor.Trait<Shroud>();
}
public bool IsVisible(Actor self)
public bool IsVisible(Actor self, Player byPlayer)
{
return self.World.LocalPlayer == null
|| self.Owner == self.World.LocalPlayer
|| self.Owner == byPlayer
|| self.World.LocalPlayer.Shroud.Disabled
|| shroud.visibleCells[self.Location.X, self.Location.Y] > 0;
}
@@ -38,7 +38,7 @@ namespace OpenRA.Mods.RA
static Renderable[] Nothing = { };
public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)
{
return IsVisible(self) ? r : Nothing;
return IsVisible(self, self.World.LocalPlayer) ? r : Nothing;
}
}
}