From 73031ee5a0730d4011a6720fc8295be60adf33ff Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Wed, 21 May 2025 20:23:12 -0400 Subject: [PATCH] Cleanup warnings in `NodeVisualizationOverlay` (#37707) Cleanup 2 warnings in NodeVisualizationOverlay --- .../NodeContainer/NodeVisualizationOverlay.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Content.Client/NodeContainer/NodeVisualizationOverlay.cs b/Content.Client/NodeContainer/NodeVisualizationOverlay.cs index b0bdf8ed87..9466ca032b 100644 --- a/Content.Client/NodeContainer/NodeVisualizationOverlay.cs +++ b/Content.Client/NodeContainer/NodeVisualizationOverlay.cs @@ -21,9 +21,10 @@ namespace Content.Client.NodeContainer private readonly IInputManager _inputManager; private readonly IEntityManager _entityManager; private readonly SharedTransformSystem _transformSystem; + private readonly SharedMapSystem _mapSystem; private readonly Dictionary<(int, int), NodeRenderData> _nodeIndex = new(); - private readonly Dictionary>> _gridIndex = new (); + private readonly Dictionary>> _gridIndex = new(); private List> _grids = new(); private readonly Font _font; @@ -48,6 +49,7 @@ namespace Content.Client.NodeContainer _inputManager = inputManager; _entityManager = entityManager; _transformSystem = _entityManager.System(); + _mapSystem = _entityManager.System(); _font = cache.GetFont("/Fonts/NotoSans/NotoSans-Regular.ttf", 12); } @@ -84,7 +86,7 @@ namespace Content.Client.NodeContainer var xform = _entityManager.GetComponent(_entityManager.GetEntity(node.Entity)); if (!_entityManager.TryGetComponent(xform.GridUid, out var grid)) return; - var gridTile = grid.TileIndicesFor(xform.Coordinates); + var gridTile = _mapSystem.TileIndicesFor((xform.GridUid.Value, grid), xform.Coordinates); var sb = new StringBuilder(); sb.Append($"entity: {node.Entity}\n"); @@ -133,7 +135,7 @@ namespace Content.Client.NodeContainer if (float.IsNaN(coords.Position.X) || float.IsNaN(coords.Position.Y)) continue; - var tile = gridDict.GetOrNew(grid.Comp.TileIndicesFor(coords)); + var tile = gridDict.GetOrNew(_mapSystem.TileIndicesFor(grid, coords)); foreach (var (group, nodeDatum) in nodeData) { @@ -153,7 +155,7 @@ namespace Content.Client.NodeContainer var lCursorBox = invMatrix.TransformBox(cursorBox); foreach (var (pos, list) in gridDict) { - var centerPos = (Vector2) pos + grid.TileSizeHalfVector; + var centerPos = (Vector2)pos + grid.TileSizeHalfVector; list.Sort(NodeDisplayComparer.Instance); var offset = -(list.Count - 1) * nodeOffset / 2;