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

Merge pull request #12086 from pchote/fake-spy-infiltration

Browse Source 
Fix spy infiltration cursor giving away fake buildings.
This commit is contained in:
Oliver Brakmann
2016-10-01 20:20:44 +02:00
committed by GitHub
parent 45f779e9c0 c781061300
commit 0d54f2994f
6 changed files with 75 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenRA.Mods.Common/Traits/Render/WithDecoration.cs
View File

@@ -69,7 +69,17 @@ namespace OpenRA.Mods.Common.Traits.Render
Anim.PlayRepeating(info.Sequence);
}
public virtual bool ShouldRender(Actor self) { return true; }
protected virtual bool ShouldRender(Actor self)
{
if (self.World.RenderPlayer != null)
{
var stance = self.Owner.Stances[self.World.RenderPlayer];
if (!Info.ValidStances.HasStance(stance))
return false;
}
return true;
}
IEnumerable<IRenderable> IRenderAboveShroud.RenderAboveShroud(Actor self, WorldRenderer wr)
{
@@ -86,13 +96,6 @@ namespace OpenRA.Mods.Common.Traits.Render
if (IsTraitDisabled || self.IsDead || !self.IsInWorld || Anim == null)
return Enumerable.Empty<IRenderable>();
if (self.World.RenderPlayer != null)
{
var stance = self.Owner.Stances[self.World.RenderPlayer];
if (!Info.ValidStances.HasStance(stance))
return Enumerable.Empty<IRenderable>();
}
if (!ShouldRender(self) || self.World.FogObscures(self))
return Enumerable.Empty<IRenderable>();