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

Fix pre-placed frozen actors not being targetable

Browse Source
This commit is contained in:
Oliver Brakmann
2019-02-10 18:21:30 +01:00
committed by Paul Chote
parent be741cea5e
commit 6841da286c
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,17 +73,6 @@ namespace OpenRA.Mods.Common.Traits
player.PlayerActor.Trait<FrozenActorLayer>().Add(frozenActor); player.PlayerActor.Trait<FrozenActorLayer>().Add(frozenActor);
return new FrozenState(frozenActor) { IsVisible = startsRevealed }; return new FrozenState(frozenActor) { IsVisible = startsRevealed };
}); });
// Defer updating the frozen actor until we are sure that the
// actor's ITargetablePositions traits have been initialized
self.World.AddFrameEndTask(w =>
{
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) void UpdateFrozenActor(Actor self, FrozenActor frozenActor, int playerIndex)
@@ -126,6 +115,18 @@ namespace OpenRA.Mods.Common.Traits
if (self.Disposed) if (self.Disposed)
return; return;
// Set the initial visibility state
// This relies on actor.GetTargetablePositions(), which is not safe to use from Created
// so we defer until the first real tick.
if (!created && startsRevealed)
{
for (var playerIndex = 0; playerIndex < frozenStates.Count; playerIndex++)
UpdateFrozenActor(self, frozenStates[playerIndex].FrozenActor, playerIndex);
created = true;
return;
}
VisibilityHash = 0; VisibilityHash = 0;
for (var playerIndex = 0; playerIndex < frozenStates.Count; playerIndex++) for (var playerIndex = 0; playerIndex < frozenStates.Count; playerIndex++)