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

Remove 700 usages of Component.Owner (#21100)

Browse Source
This commit is contained in:
DrSmugleaf
2023-10-19 12:34:31 -07:00
committed by GitHub
parent 5825ffb95c
commit f560f88eb5
261 changed files with 2291 additions and 2036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Client/Fluids/PuddleOverlay.cs
View File

@@ -1,9 +1,9 @@
using System.Numerics;
using Content.Shared.FixedPoint;
using Content.Shared.FixedPoint;
using Robust.Client.Graphics;
using Robust.Client.ResourceManagement;
using Robust.Shared.Enums;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
namespace Content.Client.Fluids;
@@ -52,7 +52,7 @@ public sealed class PuddleOverlay : Overlay
foreach (var gridId in _debugOverlaySystem.TileData.Keys)
{
if (!_mapManager.TryGetGrid(gridId, out var mapGrid))
if (!_entityManager.TryGetComponent(gridId, out MapGridComponent? mapGrid))
continue;
var gridXform = xformQuery.GetComponent(gridId);
@@ -60,7 +60,7 @@ public sealed class PuddleOverlay : Overlay
gridBounds = invWorldMatrix.TransformBox(args.WorldBounds).Enlarged(mapGrid.TileSize * 2);
drawHandle.SetTransform(worldMatrix);
foreach (var debugOverlayData in _debugOverlaySystem.GetData(mapGrid.Owner))
foreach (var debugOverlayData in _debugOverlaySystem.GetData(gridId))
{
var centre = (debugOverlayData.Pos + Vector2Helpers.Half) * mapGrid.TileSize;
@@ -85,14 +85,14 @@ public sealed class PuddleOverlay : Overlay
foreach (var gridId in _debugOverlaySystem.TileData.Keys)
{
if (!_mapManager.TryGetGrid(gridId, out var mapGrid))
if (!_entityManager.TryGetComponent(gridId, out MapGridComponent? mapGrid))
continue;
var gridXform = xformQuery.GetComponent(gridId);
var (_, _, matrix, invMatrix) = gridXform.GetWorldPositionRotationMatrixWithInv(xformQuery);
var gridBounds = invMatrix.TransformBox(args.WorldBounds).Enlarged(mapGrid.TileSize * 2);
foreach (var debugOverlayData in _debugOverlaySystem.GetData(mapGrid.Owner))
foreach (var debugOverlayData in _debugOverlaySystem.GetData(gridId))
{
var centre = (debugOverlayData.Pos + Vector2Helpers.Half) * mapGrid.TileSize;