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

Remove Player.CanViewActor and .CanTargetActor.

Browse Source
This commit is contained in:
Paul Chote
2017-10-05 16:59:42 +00:00
committed by reaperrr
parent 47634b25f9
commit 1376ad674e
10 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Game/Player.cs
View File

@@ -162,16 +162,6 @@ namespace OpenRA
return p == null || Stances[p] == Stance.Ally || (p.Spectating && !NonCombatant);
}
public bool CanViewActor(Actor a)
{
return a.CanBeViewedByPlayer(this);
}
public bool CanTargetActor(Actor a)
{
return CanViewActor(a);
}
public Color PlayerStanceColor(Actor a)
{
var player = a.World.RenderPlayer ?? a.World.LocalPlayer;

2
OpenRA.Game/World.cs
View File

@@ -77,7 +77,7 @@ namespace OpenRA
set { renderPlayer = value; }
}
public bool FogObscures(Actor a) { return RenderPlayer != null && !RenderPlayer.CanViewActor(a); }
public bool FogObscures(Actor a) { return RenderPlayer != null && !a.CanBeViewedByPlayer(RenderPlayer); }
public bool FogObscures(CPos p) { return RenderPlayer != null && !RenderPlayer.Shroud.IsVisible(p); }
public bool FogObscures(WPos pos) { return RenderPlayer != null && !RenderPlayer.Shroud.IsVisible(pos); }
public bool ShroudObscures(CPos p) { return RenderPlayer != null && !RenderPlayer.Shroud.IsExplored(p); }