From be6078557a9f120662e68f06d9a1fa721f423348 Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Tue, 13 May 2025 18:22:25 -0400 Subject: [PATCH] Cleanup warnings in `RevenantSystem` (#37430) Cleanup warnings in RevenantSystem --- Content.Client/Revenant/RevenantSystem.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Content.Client/Revenant/RevenantSystem.cs b/Content.Client/Revenant/RevenantSystem.cs index e050fe35aa..0534522b40 100644 --- a/Content.Client/Revenant/RevenantSystem.cs +++ b/Content.Client/Revenant/RevenantSystem.cs @@ -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(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(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(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}"); } } -- 2.51.2