tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup warnings in ApcVisualizerSystem (#37396)

Browse Source
This commit is contained in:
Tayrtahn
2025-05-12 19:53:11 -04:00
committed by GitHub
parent b9c500ff59
commit 9c017b7848
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Content.Client/Power/APC/ApcVisualizerSystem.cs
View File

@@ -1,5 +1,4 @@
using Content.Shared.APC;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
namespace Content.Client.Power.APC;
@@ -7,6 +6,7 @@ namespace Content.Client.Power.APC;
public sealed class ApcVisualizerSystem : VisualizerSystem<ApcVisualsComponent>
{
[Dependency] private readonly SharedPointLightSystem _lights = default!;
[Dependency] private readonly SpriteSystem _sprite = default!;
protected override void OnAppearanceChange(EntityUid uid, ApcVisualsComponent comp, ref AppearanceChangeEvent args)
{
@@ -14,8 +14,8 @@ public sealed class ApcVisualizerSystem : VisualizerSystem<ApcVisualsComponent>
return;
// get the mapped layer index of the first lock layer and the first channel layer
var lockIndicatorOverlayStart = args.Sprite.LayerMapGet(ApcVisualLayers.InterfaceLock);
var channelIndicatorOverlayStart = args.Sprite.LayerMapGet(ApcVisualLayers.Equipment);
var lockIndicatorOverlayStart = _sprite.LayerMapGet((uid, args.Sprite), ApcVisualLayers.InterfaceLock);
var channelIndicatorOverlayStart = _sprite.LayerMapGet((uid, args.Sprite), ApcVisualLayers.Equipment);
// Handle APC screen overlay:
if (!AppearanceSystem.TryGetData<ApcChargeState>(uid, ApcVisuals.ChargeState, out var chargeState, args.Component))
@@ -23,17 +23,17 @@ public sealed class ApcVisualizerSystem : VisualizerSystem<ApcVisualsComponent>
if (chargeState >= 0 && chargeState < ApcChargeState.NumStates)
{
args.Sprite.LayerSetState(ApcVisualLayers.ChargeState, $"{comp.ScreenPrefix}-{comp.ScreenSuffixes[(sbyte)chargeState]}");
_sprite.LayerSetRsiState((uid, args.Sprite), ApcVisualLayers.ChargeState, $"{comp.ScreenPrefix}-{comp.ScreenSuffixes[(sbyte)chargeState]}");
// LockState does nothing currently. The backend doesn't exist.
if (AppearanceSystem.TryGetData<byte>(uid, ApcVisuals.LockState, out var lockStates, args.Component))
{
for (var i = 0; i < comp.LockIndicators; ++i)
{
var layer = ((byte)lockIndicatorOverlayStart + i);
sbyte lockState = (sbyte)((lockStates >> (i << (sbyte)ApcLockState.LogWidth)) & (sbyte)ApcLockState.All);
args.Sprite.LayerSetState(layer, $"{comp.LockPrefix}{i}-{comp.LockSuffixes[lockState]}");
args.Sprite.LayerSetVisible(layer, true);
var layer = (byte)lockIndicatorOverlayStart + i;
var lockState = (sbyte)((lockStates >> (i << (sbyte)ApcLockState.LogWidth)) & (sbyte)ApcLockState.All);
_sprite.LayerSetRsiState((uid, args.Sprite), layer, $"{comp.LockPrefix}{i}-{comp.LockSuffixes[lockState]}");
_sprite.LayerSetVisible((uid, args.Sprite), layer, true);
}
}
@@ -42,10 +42,10 @@ public sealed class ApcVisualizerSystem : VisualizerSystem<ApcVisualsComponent>
{
for (var i = 0; i < comp.ChannelIndicators; ++i)
{
var layer = ((byte)channelIndicatorOverlayStart + i);
sbyte channelState = (sbyte)((channelStates >> (i << (sbyte)ApcChannelState.LogWidth)) & (sbyte)ApcChannelState.All);
args.Sprite.LayerSetState(layer, $"{comp.ChannelPrefix}{i}-{comp.ChannelSuffixes[channelState]}");
args.Sprite.LayerSetVisible(layer, true);
var layer = (byte)channelIndicatorOverlayStart + i;
var channelState = (sbyte)((channelStates >> (i << (sbyte)ApcChannelState.LogWidth)) & (sbyte)ApcChannelState.All);
_sprite.LayerSetRsiState((uid, args.Sprite), layer, $"{comp.ChannelPrefix}{i}-{comp.ChannelSuffixes[channelState]}");
_sprite.LayerSetVisible((uid, args.Sprite), layer, true);
}
}
@@ -57,16 +57,16 @@ public sealed class ApcVisualizerSystem : VisualizerSystem<ApcVisualsComponent>
else
{
/// Overrides all of the lock and channel indicators.
args.Sprite.LayerSetState(ApcVisualLayers.ChargeState, comp.EmaggedScreenState);
_sprite.LayerSetRsiState((uid, args.Sprite), ApcVisualLayers.ChargeState, comp.EmaggedScreenState);
for (var i = 0; i < comp.LockIndicators; ++i)
{
var layer = ((byte)lockIndicatorOverlayStart + i);
args.Sprite.LayerSetVisible(layer, false);
var layer = (byte)lockIndicatorOverlayStart + i;
_sprite.LayerSetVisible((uid, args.Sprite), layer, false);
}
for (var i = 0; i < comp.ChannelIndicators; ++i)
{
var layer = ((byte)channelIndicatorOverlayStart + i);
args.Sprite.LayerSetVisible(layer, false);
var layer = (byte)channelIndicatorOverlayStart + i;
_sprite.LayerSetVisible((uid, args.Sprite), layer, false);
}
if (TryComp<PointLightComponent>(uid, out var light))
@@ -77,7 +77,7 @@ public sealed class ApcVisualizerSystem : VisualizerSystem<ApcVisualsComponent>
}
}
enum ApcVisualLayers : byte
public enum ApcVisualLayers : byte
{
/// <summary>
/// The sprite layer used for the interface lock indicator light overlay.