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

Ensure Clear(T) also have a safety check to ensure no listener is attached.

Browse Source 
Move related methods next to each other.
Change Clear(T) to use Array.Fill.
This commit is contained in:
RoosterDragon
2021-09-25 13:51:24 +01:00
committed by abcdefg30
parent 19760b04bd
commit 2ed4cb8aff
3 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
OpenRA.Game/Map/CellLayer.cs
View File

@@ -25,24 +25,33 @@ namespace OpenRA
public CellLayer(MapGridType gridType, Size size) public CellLayer(MapGridType gridType, Size size)
: base(gridType, size) { } : base(gridType, size) { }
public override void Clear()
{
if (CellEntryChanged != null)
throw new InvalidOperationException(
"Cannot clear values when there are listeners attached to the CellEntryChanged event.");
base.Clear();
}
public override void CopyValuesFrom(CellLayerBase<T> anotherLayer) public override void CopyValuesFrom(CellLayerBase<T> anotherLayer)
{ {
if (CellEntryChanged != null) if (CellEntryChanged != null)
throw new InvalidOperationException( throw new InvalidOperationException(
"Cannot copy values when there are listeners attached to the CellEntryChanged event."); $"Cannot copy values when there are listeners attached to the {nameof(CellEntryChanged)} event.");
base.CopyValuesFrom(anotherLayer); base.CopyValuesFrom(anotherLayer);
} }
public override void Clear()
{
if (CellEntryChanged != null)
throw new InvalidOperationException(
$"Cannot clear values when there are listeners attached to the {nameof(CellEntryChanged)} event.");
base.Clear();
}
public override void Clear(T clearValue)
{
if (CellEntryChanged != null)
throw new InvalidOperationException(
$"Cannot clear values when there are listeners attached to the {nameof(CellEntryChanged)} event.");
base.Clear(clearValue);
}
// Resolve an array index from cell coordinates // Resolve an array index from cell coordinates
int Index(CPos cell) int Index(CPos cell)
{ {

18
OpenRA.Game/Map/CellLayerBase.cs
View File

@@ -35,11 +35,6 @@ namespace OpenRA
entries = new T[size.Width * size.Height]; entries = new T[size.Width * size.Height];
} }
public virtual void Clear()
{
Array.Clear(entries, 0, entries.Length);
}
public virtual void CopyValuesFrom(CellLayerBase<T> anotherLayer) public virtual void CopyValuesFrom(CellLayerBase<T> anotherLayer)
{ {
if (Size != anotherLayer.Size || GridType != anotherLayer.GridType) if (Size != anotherLayer.Size || GridType != anotherLayer.GridType)
@@ -48,11 +43,16 @@ namespace OpenRA
Array.Copy(anotherLayer.entries, entries, entries.Length); Array.Copy(anotherLayer.entries, entries, entries.Length);
} }
/// <summary>Clears the layer contents with a known value</summary> /// <summary>Clears the layer contents with their default value</summary>
public void Clear(T clearValue) public virtual void Clear()
{ {
for (var i = 0; i < entries.Length; i++) Array.Clear(entries, 0, entries.Length);
entries[i] = clearValue; }
/// <summary>Clears the layer contents with a known value</summary>
public virtual void Clear(T clearValue)
{
Array.Fill(entries, clearValue);
} }
public IEnumerator<T> GetEnumerator() public IEnumerator<T> GetEnumerator()

3
OpenRA.Game/Map/Map.cs
View File

@@ -309,6 +309,7 @@ namespace OpenRA
Resources = new CellLayer<ResourceTile>(Grid.Type, size); Resources = new CellLayer<ResourceTile>(Grid.Type, size);
Height = new CellLayer<byte>(Grid.Type, size); Height = new CellLayer<byte>(Grid.Type, size);
Ramp = new CellLayer<byte>(Grid.Type, size); Ramp = new CellLayer<byte>(Grid.Type, size);
Tiles.Clear(terrainInfo.DefaultTerrainTile);
if (Grid.MaximumTerrainHeight > 0) if (Grid.MaximumTerrainHeight > 0)
{ {
Height.CellEntryChanged += UpdateProjection; Height.CellEntryChanged += UpdateProjection;
@@ -316,8 +317,6 @@ namespace OpenRA
Tiles.CellEntryChanged += UpdateRamp; Tiles.CellEntryChanged += UpdateRamp;
} }
Tiles.Clear(terrainInfo.DefaultTerrainTile);
PostInit(); PostInit();
} }