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

19
OpenRA.Mods.Common/Traits/Modifiers/FrozenUnderFog.cs
View File

@@ -9,6 +9,7 @@
*/
#endregion
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
@@ -27,7 +28,7 @@ namespace OpenRA.Mods.Common.Traits
public object Create(ActorInitializer init) { return new FrozenUnderFog(init, this); }
}
public class FrozenUnderFog : IRenderModifier, IDefaultVisibility, ITick, ITickRender, ISync, INotifyCreated
public class FrozenUnderFog : ICreatesFrozenActors, IRenderModifier, IDefaultVisibility, ITick, ITickRender, ISync, INotifyCreated
{
[Sync] public int VisibilityHash;
@@ -37,6 +38,7 @@ namespace OpenRA.Mods.Common.Traits
PlayerDictionary<FrozenState> frozenStates;
bool isRendering;
bool created;
class FrozenState
{
@@ -67,7 +69,7 @@ namespace OpenRA.Mods.Common.Traits
{
frozenStates = new PlayerDictionary<FrozenState>(self.World, (player, playerIndex) =>
{
var frozenActor = new FrozenActor(self, footprint, player, startsRevealed);
var frozenActor = new FrozenActor(self, this, footprint, player, startsRevealed);
player.PlayerActor.Trait<FrozenActorLayer>().Add(frozenActor);
return new FrozenState(frozenActor) { IsVisible = startsRevealed };
});
@@ -75,6 +77,8 @@ namespace OpenRA.Mods.Common.Traits
if (startsRevealed)
for (var playerIndex = 0; playerIndex < frozenStates.Count; playerIndex++)
UpdateFrozenActor(self, frozenStates[playerIndex].FrozenActor, playerIndex);
created = true;
}
void UpdateFrozenActor(Actor self, FrozenActor frozenActor, int playerIndex)
@@ -83,6 +87,17 @@ namespace OpenRA.Mods.Common.Traits
frozenActor.RefreshState();
}
void ICreatesFrozenActors.OnVisibilityChanged(FrozenActor frozen)
{
// Ignore callbacks during initial setup
if (!created)
return;
// Update state visibility to match the frozen actor to ensure consistency within the tick
// The rest of the state will be updated by ITick.Tick below
frozenStates[frozen.Viewer].IsVisible = !frozen.Visible;
}
bool IsVisibleInner(Actor self, Player byPlayer)
{
// If fog is disabled visibility is determined by shroud