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

Fix dock highlighting (#24369)

Browse Source 
Nentity casualty
This commit is contained in:
metalgearsloth
2024-01-21 23:14:47 +11:00
committed by GitHub
parent 14e583cf3e
commit 6ae64929ba
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Client/Shuttles/UI/RadarControl.cs
View File

@@ -47,7 +47,7 @@ public sealed class RadarControl : MapGridControl
/// <summary> /// <summary>
/// Currently hovered docked to show on the map. /// Currently hovered docked to show on the map.
/// </summary> /// </summary>
public EntityUid? HighlightedDock; public NetEntity? HighlightedDock;
/// <summary> /// <summary>
/// Raised if the user left-clicks on the radar control with the relevant entitycoordinates. /// Raised if the user left-clicks on the radar control with the relevant entitycoordinates.
@@ -325,14 +325,13 @@ public sealed class RadarControl : MapGridControl
{ {
foreach (var state in docks) foreach (var state in docks)
{ {
var ent = _entManager.GetEntity(state.Entity);
var position = state.Coordinates.Position; var position = state.Coordinates.Position;
var uiPosition = matrix.Transform(position); var uiPosition = matrix.Transform(position);
if (uiPosition.Length() > WorldRange - DockScale) if (uiPosition.Length() > WorldRange - DockScale)
continue; continue;
var color = HighlightedDock == ent ? state.HighlightedColor : state.Color; var color = HighlightedDock == state.Entity ? state.HighlightedColor : state.Color;
uiPosition.Y = -uiPosition.Y; uiPosition.Y = -uiPosition.Y;

2
Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
View File

@@ -234,7 +234,7 @@ public sealed partial class ShuttleConsoleWindow : FancyWindow,
private void OnDockMouseEntered(GUIMouseHoverEventArgs obj, DockingInterfaceState state) private void OnDockMouseEntered(GUIMouseHoverEventArgs obj, DockingInterfaceState state)
{ {
RadarScreen.HighlightedDock = _entManager.GetEntity(state.Entity); RadarScreen.HighlightedDock = state.Entity;
} }
private void OnDockMouseExited(GUIMouseHoverEventArgs obj, DockingInterfaceState state) private void OnDockMouseExited(GUIMouseHoverEventArgs obj, DockingInterfaceState state)