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

Fix incorrect shroud visibility for stationary units.

Browse Source
This commit is contained in:
Paul Chote
2019-08-17 09:45:25 +00:00
committed by abcdefg30
parent 4db3da61e1
commit 76d1447a91
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.Common/Traits/AffectsShroud.cs
View File

@@ -27,7 +27,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly VisibilityType Type = VisibilityType.Footprint; public readonly VisibilityType Type = VisibilityType.Footprint;
} }
public abstract class AffectsShroud : ConditionalTrait<AffectsShroudInfo>, ITick, ISync, INotifyAddedToWorld, INotifyRemovedFromWorld public abstract class AffectsShroud : ConditionalTrait<AffectsShroudInfo>, ITick, ISync, INotifyAddedToWorld, INotifyRemovedFromWorld, INotifyMoving
{ {
static readonly PPos[] NoCells = { }; static readonly PPos[] NoCells = { };
@@ -42,6 +42,8 @@ namespace OpenRA.Mods.Common.Traits
[Sync] [Sync]
protected bool CachedTraitDisabled { get; private set; } protected bool CachedTraitDisabled { get; private set; }
bool dirty;
protected abstract void AddCellsToPlayerShroud(Actor self, Player player, PPos[] uv); protected abstract void AddCellsToPlayerShroud(Actor self, Player player, PPos[] uv);
protected abstract void RemoveCellsFromPlayerShroud(Actor self, Player player); protected abstract void RemoveCellsFromPlayerShroud(Actor self, Player player);
@@ -88,12 +90,13 @@ namespace OpenRA.Mods.Common.Traits
var traitDisabled = IsTraitDisabled; var traitDisabled = IsTraitDisabled;
var range = Range; var range = Range;
if (cachedLocation == projectedLocation && cachedRange == range && traitDisabled == CachedTraitDisabled) if (!dirty && cachedLocation == projectedLocation && cachedRange == range && traitDisabled == CachedTraitDisabled)
return; return;
cachedRange = range; cachedRange = range;
cachedLocation = projectedLocation; cachedLocation = projectedLocation;
CachedTraitDisabled = traitDisabled; CachedTraitDisabled = traitDisabled;
dirty = false;
var cells = ProjectedCells(self); var cells = ProjectedCells(self);
foreach (var p in self.World.Players) foreach (var p in self.World.Players)
@@ -122,5 +125,12 @@ namespace OpenRA.Mods.Common.Traits
} }
public virtual WDist Range { get { return CachedTraitDisabled ? WDist.Zero : Info.Range; } } public virtual WDist Range { get { return CachedTraitDisabled ? WDist.Zero : Info.Range; } }
void INotifyMoving.MovementTypeChanged(Actor self, MovementType type)
{
// Recalculate the visiblity at our final stop position
if (type == MovementType.None)
dirty = true;
}
} }
} }