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

Remove IsDisabled from AffectsShroud traits

Browse Source 
Makes them only disableable via conditions.
This commit is contained in:
reaperrr
2017-09-12 20:44:25 +02:00
committed by Pavel Penev
parent 00cd7a8da5
commit cea2658f31
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,12 +31,10 @@ namespace OpenRA.Mods.Common.Traits
static readonly PPos[] NoCells = { }; static readonly PPos[] NoCells = { };
[Sync] CPos cachedLocation; [Sync] CPos cachedLocation;
[Sync] bool cachedDisabled;
[Sync] bool cachedTraitDisabled; [Sync] bool cachedTraitDisabled;
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);
protected virtual bool IsDisabled(Actor self) { return false; }
public AffectsShroud(Actor self, AffectsShroudInfo info) public AffectsShroud(Actor self, AffectsShroudInfo info)
: base(info) { } : base(info) { }
@@ -69,14 +67,12 @@ namespace OpenRA.Mods.Common.Traits
var centerPosition = self.CenterPosition; var centerPosition = self.CenterPosition;
var projectedPos = centerPosition - new WVec(0, centerPosition.Z, centerPosition.Z); var projectedPos = centerPosition - new WVec(0, centerPosition.Z, centerPosition.Z);
var projectedLocation = self.World.Map.CellContaining(projectedPos); var projectedLocation = self.World.Map.CellContaining(projectedPos);
var disabled = IsDisabled(self);
var traitDisabled = IsTraitDisabled; var traitDisabled = IsTraitDisabled;
if (cachedLocation == projectedLocation && traitDisabled == cachedTraitDisabled && cachedDisabled == disabled) if (cachedLocation == projectedLocation && traitDisabled == cachedTraitDisabled)
return; return;
cachedLocation = projectedLocation; cachedLocation = projectedLocation;
cachedDisabled = disabled;
cachedTraitDisabled = traitDisabled; cachedTraitDisabled = traitDisabled;
var cells = ProjectedCells(self); var cells = ProjectedCells(self);
@@ -92,7 +88,6 @@ namespace OpenRA.Mods.Common.Traits
var centerPosition = self.CenterPosition; var centerPosition = self.CenterPosition;
var projectedPos = centerPosition - new WVec(0, centerPosition.Z, centerPosition.Z); var projectedPos = centerPosition - new WVec(0, centerPosition.Z, centerPosition.Z);
cachedLocation = self.World.Map.CellContaining(projectedPos); cachedLocation = self.World.Map.CellContaining(projectedPos);
cachedDisabled = IsDisabled(self);
cachedTraitDisabled = IsTraitDisabled; cachedTraitDisabled = IsTraitDisabled;
var cells = ProjectedCells(self); var cells = ProjectedCells(self);
@@ -106,6 +101,6 @@ namespace OpenRA.Mods.Common.Traits
RemoveCellsFromPlayerShroud(self, p); RemoveCellsFromPlayerShroud(self, p);
} }
public WDist Range { get { return (cachedDisabled || cachedTraitDisabled) ? WDist.Zero : Info.Range; } } public WDist Range { get { return cachedTraitDisabled ? WDist.Zero : Info.Range; } }
} }
} }

2
OpenRA.Mods.Common/Traits/CreatesShroud.cs
View File

@@ -37,7 +37,5 @@ namespace OpenRA.Mods.Common.Traits
} }
protected override void RemoveCellsFromPlayerShroud(Actor self, Player p) { p.Shroud.RemoveSource(this); } protected override void RemoveCellsFromPlayerShroud(Actor self, Player p) { p.Shroud.RemoveSource(this); }
protected override bool IsDisabled(Actor self) { return self.IsDisabled(); }
} }
} }