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

14
Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs
View File

@@ -11,7 +11,7 @@ public sealed partial class ExplosionSystem : EntitySystem
/// <summary>
/// Set of tiles of each grid that are directly adjacent to space, along with the directions that face space.
/// </summary>
private Dictionary<GridId, Dictionary<Vector2i, NeighborFlag>> _gridEdges = new();
private Dictionary<EntityUid, Dictionary<Vector2i, NeighborFlag>> _gridEdges = new();
/// <summary>
/// On grid startup, prepare a map of grid edges.
@@ -42,8 +42,8 @@ public sealed partial class ExplosionSystem : EntitySystem
/// </summary>
public (Dictionary<Vector2i, BlockedSpaceTile>, ushort) TransformGridEdges(
MapCoordinates epicentre,
GridId? referenceGrid,
List<GridId> localGrids,
EntityUid? referenceGrid,
List<EntityUid> localGrids,
float maxDistance)
{
Dictionary<Vector2i, BlockedSpaceTile> transformedEdges = new();
@@ -230,10 +230,10 @@ public sealed partial class ExplosionSystem : EntitySystem
var tileRef = ev.NewTile;
if (!_gridEdges.TryGetValue(tileRef.GridIndex, out var edges))
if (!_gridEdges.TryGetValue(tileRef.GridUid, out var edges))
{
edges = new();
_gridEdges[tileRef.GridIndex] = edges;
_gridEdges[tileRef.GridUid] = edges;
}
if (tileRef.Tile.IsEmpty)
@@ -373,10 +373,10 @@ public sealed class BlockedSpaceTile
public sealed class GridEdgeData
{
public Vector2i Tile;
public GridId? Grid;
public EntityUid? Grid;
public Box2Rotated Box;
public GridEdgeData(Vector2i tile, GridId? grid, Vector2 center, Angle angle, float size)
public GridEdgeData(Vector2i tile, EntityUid? grid, Vector2 center, Angle angle, float size)
{
Tile = tile;
Grid = grid;