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

Content.Client/Revenant/RevenantSystem.cs

index e050fe35aa2cf408f883f5755754301b7ea291ce..0534522b40a45e87f34c1a1b37f361f47d084beb 100644 (file)
@@ -8,6 +8,7 @@ namespace Content.Client.Revenant;
 public sealed class RevenantSystem : EntitySystem
 {
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
+    [Dependency] private readonly SpriteSystem _sprite = default!;
 
     public override void Initialize()
     {
@@ -24,18 +25,18 @@ public sealed class RevenantSystem : EntitySystem
 
         if (_appearance.TryGetData<bool>(uid, RevenantVisuals.Harvesting, out var harvesting, args.Component) && harvesting)
         {
-            args.Sprite.LayerSetState(0, component.HarvestingState);
+            _sprite.LayerSetRsiState((uid, args.Sprite), 0, component.HarvestingState);
         }
         else if (_appearance.TryGetData<bool>(uid, RevenantVisuals.Stunned, out var stunned, args.Component) && stunned)
         {
-            args.Sprite.LayerSetState(0, component.StunnedState);
+            _sprite.LayerSetRsiState((uid, args.Sprite), 0, component.StunnedState);
         }
         else if (_appearance.TryGetData<bool>(uid, RevenantVisuals.Corporeal, out var corporeal, args.Component))
         {
             if (corporeal)
-                args.Sprite.LayerSetState(0, component.CorporealState);
+                _sprite.LayerSetRsiState((uid, args.Sprite), 0, component.CorporealState);
             else
-                args.Sprite.LayerSetState(0, component.State);
+                _sprite.LayerSetRsiState((uid, args.Sprite), 0, component.State);
         }
     }
 
@@ -44,10 +45,9 @@ public sealed class RevenantSystem : EntitySystem
         if (args.Alert.ID != ent.Comp.EssenceAlert)
             return;
 
-        var sprite = args.SpriteViewEnt.Comp;
         var essence = Math.Clamp(ent.Comp.Essence.Int(), 0, 999);
-        sprite.LayerSetState(RevenantVisualLayers.Digit1, $"{(essence / 100) % 10}");
-        sprite.LayerSetState(RevenantVisualLayers.Digit2, $"{(essence / 10) % 10}");
-        sprite.LayerSetState(RevenantVisualLayers.Digit3, $"{essence % 10}");
+        _sprite.LayerSetRsiState(args.SpriteViewEnt.AsNullable(), RevenantVisualLayers.Digit1, $"{(essence / 100) % 10}");
+        _sprite.LayerSetRsiState(args.SpriteViewEnt.AsNullable(), RevenantVisualLayers.Digit2, $"{(essence / 10) % 10}");
+        _sprite.LayerSetRsiState(args.SpriteViewEnt.AsNullable(), RevenantVisualLayers.Digit3, $"{essence % 10}");
     }
 }