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

Fix multiplying colors of differing nullabilities (#32991)

Browse Source
This commit is contained in:
chromiumboy
2024-10-24 23:06:38 -05:00
committed by GitHub
parent d4da9923ea
commit 5ff5a72a7c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/Atmos/Consoles/AtmosAlertsComputerWindow.xaml.cs
View File

@@ -292,7 +292,7 @@ public sealed partial class AtmosAlertsComputerWindow : FancyWindow
if (!TryGetSensorRegionColor(regionOwner, alarmState, out var regionColor)) if (!TryGetSensorRegionColor(regionOwner, alarmState, out var regionColor))
continue; continue;
regionOverlay.Color = regionColor.Value; regionOverlay.Color = regionColor;
var priority = (_trackedEntity == regionOwner) ? 999 : (int)alarmState; var priority = (_trackedEntity == regionOwner) ? 999 : (int)alarmState;
prioritizedRegionOverlays.Add(regionOverlay, priority); prioritizedRegionOverlays.Add(regionOverlay, priority);
@@ -331,9 +331,9 @@ public sealed partial class AtmosAlertsComputerWindow : FancyWindow
NavMap.TrackedEntities[metaData.NetEntity] = blip; NavMap.TrackedEntities[metaData.NetEntity] = blip;
} }
private bool TryGetSensorRegionColor(NetEntity regionOwner, AtmosAlarmType alarmState, [NotNullWhen(true)] out Color? color) private bool TryGetSensorRegionColor(NetEntity regionOwner, AtmosAlarmType alarmState, out Color color)
{ {
color = null; color = Color.White;
var blip = GetBlipTexture(alarmState); var blip = GetBlipTexture(alarmState);