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

Fix FrozenUnderFog / FrozenActor visibility consistency.

Browse Source 
This fixes cases where both objects return visible / not
when queried at the wrong time during a tick.
This commit is contained in:
Paul Chote
2019-01-26 18:43:58 +00:00
committed by reaperrr
parent dc40a973e3
commit d6d1f3a06d
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Game/Traits/Player/FrozenActorLayer.cs
View File

@@ -18,6 +18,11 @@ using OpenRA.Primitives;
namespace OpenRA.Traits
{
public interface ICreatesFrozenActors
{
void OnVisibilityChanged(FrozenActor frozen);
}
[Desc("Required for FrozenUnderFog to work. Attach this to the player actor.")]
public class FrozenActorLayerInfo : Requires<ShroudInfo>, ITraitInfo
{
@@ -32,6 +37,7 @@ namespace OpenRA.Traits
public readonly PPos[] Footprint;
public readonly WPos CenterPosition;
readonly Actor actor;
readonly ICreatesFrozenActors frozenTrait;
readonly Player viewer;
readonly Shroud shroud;
@@ -70,9 +76,10 @@ namespace OpenRA.Traits
int flashTicks;
public FrozenActor(Actor actor, PPos[] footprint, Player viewer, bool startsRevealed)
public FrozenActor(Actor actor, ICreatesFrozenActors frozenTrait, PPos[] footprint, Player viewer, bool startsRevealed)
{
this.actor = actor;
this.frozenTrait = frozenTrait;
this.viewer = viewer;
shroud = viewer.Shroud;
NeedRenderables = startsRevealed;
@@ -153,6 +160,11 @@ namespace OpenRA.Traits
Shrouded = false;
}
// Force the backing trait to update so other actors can't
// query inconsistent state (both hidden or both visible)
if (Visible != wasVisible)
frozenTrait.OnVisibilityChanged(this);
NeedRenderables |= Visible && !wasVisible;
}