From ba2a3543d94b40fdb90a414734c985155b2cebac Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Wed, 14 May 2025 13:31:03 -0400 Subject: [PATCH] Cleanup warnings in `ClientInnerBodySystem` (#37450) * Cleanup warnings in ClientInnerBodySystem * Apply suggested simplification --- .../Anomaly/Effects/ClientInnerBodySystem.cs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs b/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs index efb1a8d46e..15ebc8a993 100644 --- a/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs +++ b/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs @@ -7,6 +7,8 @@ namespace Content.Client.Anomaly.Effects; public sealed class ClientInnerBodyAnomalySystem : SharedInnerBodyAnomalySystem { + [Dependency] private readonly SpriteSystem _sprite = default!; + public override void Initialize() { SubscribeLocalEvent(OnAfterHandleState); @@ -21,21 +23,20 @@ public sealed class ClientInnerBodyAnomalySystem : SharedInnerBodyAnomalySystem if (ent.Comp.FallbackSprite is null) return; - if (!sprite.LayerMapTryGet(ent.Comp.LayerMap, out var index)) - index = sprite.LayerMapReserveBlank(ent.Comp.LayerMap); + var index = _sprite.LayerMapReserve((ent.Owner, sprite), ent.Comp.LayerMap); if (TryComp(ent, out var body) && body.Prototype is not null && ent.Comp.SpeciesSprites.TryGetValue(body.Prototype.Value, out var speciesSprite)) { - sprite.LayerSetSprite(index, speciesSprite); + _sprite.LayerSetSprite((ent.Owner, sprite), index, speciesSprite); } else { - sprite.LayerSetSprite(index, ent.Comp.FallbackSprite); + _sprite.LayerSetSprite((ent.Owner, sprite), index, ent.Comp.FallbackSprite); } - sprite.LayerSetVisible(index, true); + _sprite.LayerSetVisible((ent.Owner, sprite), index, true); sprite.LayerSetShader(index, "unshaded"); } @@ -44,7 +45,7 @@ public sealed class ClientInnerBodyAnomalySystem : SharedInnerBodyAnomalySystem if (!TryComp(ent, out var sprite)) return; - var index = sprite.LayerMapGet(ent.Comp.LayerMap); - sprite.LayerSetVisible(index, false); + var index = _sprite.LayerMapGet((ent.Owner, sprite), ent.Comp.LayerMap); + _sprite.LayerSetVisible((ent.Owner, sprite), index, false); } } -- 2.51.2