]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Cleanup warnings in `ClientFoodSequenceSystem` (#37431)
authorTayrtahn <tayrtahn@gmail.com>
Tue, 13 May 2025 22:24:27 +0000 (18:24 -0400)
committerGitHub <noreply@github.com>
Tue, 13 May 2025 22:24:27 +0000 (00:24 +0200)
Cleanup warnings in ClientFoodSequenceSystem

Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs

index c708c6fe7d2ef60264d25bf6728da217e14e1156..46d71917c29c28885e39db85ae433779e25fc6ed 100644 (file)
@@ -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<FoodSequenceStartPointComponent, AfterAutoHandleStateEvent>(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++;
         }