tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Explicit GridId References (#8315)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Acruid
2022-06-11 18:54:41 -07:00
committed by GitHub
parent 846321cebb
commit 4f9be42f40
131 changed files with 531 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs
View File

@@ -5,7 +5,6 @@ using JetBrains.Annotations;
using Robust.Client.Graphics;
using Robust.Client.ResourceManagement;
using Robust.Client.Utility;
using Robust.Shared.Map;
using Robust.Shared.Utility;
namespace Content.Client.Atmos.EntitySystems
@@ -31,7 +30,7 @@ namespace Content.Client.Atmos.EntitySystems
public readonly int[] FireFrameCounter = new int[FireStates];
public readonly Texture[][] FireFrames = new Texture[FireStates][];
private readonly Dictionary<GridId, Dictionary<Vector2i, GasOverlayChunk>> _tileData =
private readonly Dictionary<EntityUid, Dictionary<Vector2i, GasOverlayChunk>> _tileData =
new();
public const int GasOverlayZIndex = 1;
@@ -95,7 +94,7 @@ namespace Content.Client.Atmos.EntitySystems
}
// Slightly different to the server-side system version
private GasOverlayChunk GetOrCreateChunk(GridId gridId, Vector2i indices)
private GasOverlayChunk GetOrCreateChunk(EntityUid gridId, Vector2i indices)
{
if (!_tileData.TryGetValue(gridId, out var chunks))
{
@@ -130,12 +129,12 @@ namespace Content.Client.Atmos.EntitySystems
}
}
public bool HasData(GridId gridId)
public bool HasData(EntityUid gridId)
{
return _tileData.ContainsKey(gridId);
}
public GasOverlayEnumerator GetOverlays(GridId gridIndex, Vector2i indices)
public GasOverlayEnumerator GetOverlays(EntityUid gridIndex, Vector2i indices)
{
if (!_tileData.TryGetValue(gridIndex, out var chunks))
return default;
@@ -149,7 +148,7 @@ namespace Content.Client.Atmos.EntitySystems
return new GasOverlayEnumerator(overlays, this);
}
public FireOverlayEnumerator GetFireOverlays(GridId gridIndex, Vector2i indices)
public FireOverlayEnumerator GetFireOverlays(EntityUid gridIndex, Vector2i indices)
{
if (!_tileData.TryGetValue(gridIndex, out var chunks))
return default;