From dc92acd720a16bc91e23e5ad9f03a2e429e7d42f Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Tue, 13 May 2025 18:24:27 -0400 Subject: [PATCH] Cleanup warnings in `ClientFoodSequenceSystem` (#37431) Cleanup warnings in ClientFoodSequenceSystem --- .../EntitySystems/ClientFoodSequenceSystem.cs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs b/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs index c708c6fe7d..46d71917c2 100644 --- a/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs +++ b/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs @@ -6,6 +6,8 @@ namespace Content.Client.Nutrition.EntitySystems; public sealed class ClientFoodSequenceSystem : SharedFoodSequenceSystem { + [Dependency] private readonly SpriteSystem _sprite = default!; + public override void Initialize() { SubscribeLocalEvent(OnHandleState); @@ -27,7 +29,7 @@ public sealed class ClientFoodSequenceSystem : SharedFoodSequenceSystem //Remove old layers foreach (var key in start.Comp.RevealedLayers) { - sprite.RemoveLayer(key); + _sprite.RemoveLayer((start.Owner, sprite), key); } start.Comp.RevealedLayers.Clear(); @@ -41,20 +43,20 @@ public sealed class ClientFoodSequenceSystem : SharedFoodSequenceSystem var keyCode = $"food-layer-{counter}"; start.Comp.RevealedLayers.Add(keyCode); - sprite.LayerMapTryGet(start.Comp.TargetLayerMap, out var index); + _sprite.LayerMapTryGet((start.Owner, sprite), start.Comp.TargetLayerMap, out var index, false); if (start.Comp.InverseLayers) index++; - sprite.AddBlankLayer(index); - sprite.LayerMapSet(keyCode, index); - sprite.LayerSetSprite(index, state.Sprite); - sprite.LayerSetScale(index, state.Scale); + _sprite.AddBlankLayer((start.Owner, sprite), index); + _sprite.LayerMapSet((start.Owner, sprite), keyCode, index); + _sprite.LayerSetSprite((start.Owner, sprite), index, state.Sprite); + _sprite.LayerSetScale((start.Owner, sprite), index, state.Scale); //Offset the layer var layerPos = start.Comp.StartPosition; layerPos += (start.Comp.Offset * counter) + state.LocalOffset; - sprite.LayerSetOffset(index, layerPos); + _sprite.LayerSetOffset((start.Owner, sprite), index, layerPos); counter++; }