From 6b299046d359406ea3939f11e28e57079da61b2d Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Wed, 14 May 2025 12:13:35 -0400 Subject: [PATCH] Cleanup warnings in `KillSignSystem` (#37451) Cleanup warnings in KillSignSystem --- .../Administration/Systems/KillSignSystem.cs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Content.Client/Administration/Systems/KillSignSystem.cs b/Content.Client/Administration/Systems/KillSignSystem.cs index fb327236ca..c12f65f1f0 100644 --- a/Content.Client/Administration/Systems/KillSignSystem.cs +++ b/Content.Client/Administration/Systems/KillSignSystem.cs @@ -7,6 +7,8 @@ namespace Content.Client.Administration.Systems; public sealed class KillSignSystem : EntitySystem { + [Dependency] private readonly SpriteSystem _sprite = default!; + public override void Initialize() { SubscribeLocalEvent(KillSignAdded); @@ -18,10 +20,10 @@ public sealed class KillSignSystem : EntitySystem if (!TryComp(uid, out var sprite)) return; - if (!sprite.LayerMapTryGet(KillSignKey.Key, out var layer)) + if (!_sprite.LayerMapTryGet((uid, sprite), KillSignKey.Key, out var layer, false)) return; - sprite.RemoveLayer(layer); + _sprite.RemoveLayer((uid, sprite), layer); } private void KillSignAdded(EntityUid uid, KillSignComponent component, ComponentStartup args) @@ -29,15 +31,15 @@ public sealed class KillSignSystem : EntitySystem if (!TryComp(uid, out var sprite)) return; - if (sprite.LayerMapTryGet(KillSignKey.Key, out var _)) + if (_sprite.LayerMapTryGet((uid, sprite), KillSignKey.Key, out var _, false)) return; - var adj = sprite.Bounds.Height / 2 + ((1.0f/32) * 6.0f); + var adj = _sprite.GetLocalBounds((uid, sprite)).Height / 2 + ((1.0f / 32) * 6.0f); - var layer = sprite.AddLayer(new SpriteSpecifier.Rsi(new ResPath("Objects/Misc/killsign.rsi"), "sign")); - sprite.LayerMapSet(KillSignKey.Key, layer); + var layer = _sprite.AddLayer((uid, sprite), new SpriteSpecifier.Rsi(new ResPath("Objects/Misc/killsign.rsi"), "sign")); + _sprite.LayerMapSet((uid, sprite), KillSignKey.Key, layer); - sprite.LayerSetOffset(layer, new Vector2(0.0f, adj)); + _sprite.LayerSetOffset((uid, sprite), layer, new Vector2(0.0f, adj)); sprite.LayerSetShader(layer, "unshaded"); }