Obsolete Logger cleanup for EntitySystems part 2 (#26159)
* Kill the static InRangeUnOccluded * Adjusted 4 more EntitySystems that were missed.
This commit is contained in:
@@ -21,6 +21,7 @@ public sealed class PopupOverlay : Overlay
|
||||
private readonly IUserInterfaceManager _uiManager;
|
||||
private readonly PopupSystem _popup;
|
||||
private readonly PopupUIController _controller;
|
||||
private readonly ExamineSystemShared _examine;
|
||||
|
||||
private readonly ShaderInstance _shader;
|
||||
|
||||
@@ -33,12 +34,14 @@ public sealed class PopupOverlay : Overlay
|
||||
IPrototypeManager protoManager,
|
||||
IUserInterfaceManager uiManager,
|
||||
PopupUIController controller,
|
||||
ExamineSystemShared examine,
|
||||
PopupSystem popup)
|
||||
{
|
||||
_configManager = configManager;
|
||||
_entManager = entManager;
|
||||
_playerMgr = playerMgr;
|
||||
_uiManager = uiManager;
|
||||
_examine = examine;
|
||||
_popup = popup;
|
||||
_controller = controller;
|
||||
|
||||
@@ -81,7 +84,7 @@ public sealed class PopupOverlay : Overlay
|
||||
var distance = (mapPos.Position - args.WorldBounds.Center).Length();
|
||||
|
||||
// Should handle fade here too wyci.
|
||||
if (!args.WorldBounds.Contains(mapPos.Position) || !ExamineSystemShared.InRangeUnOccluded(viewPos, mapPos, distance,
|
||||
if (!args.WorldBounds.Contains(mapPos.Position) || !_examine.InRangeUnOccluded(viewPos, mapPos, distance,
|
||||
e => e == popup.InitialPos.EntityId || e == ourEntity, entMan: _entManager))
|
||||
continue;
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using System.Linq;
|
||||
using Content.Shared.Examine;
|
||||
using Content.Shared.GameTicking;
|
||||
using Content.Shared.Popups;
|
||||
using Robust.Client.Graphics;
|
||||
@@ -26,6 +27,7 @@ namespace Content.Client.Popups
|
||||
[Dependency] private readonly IGameTiming _timing = default!;
|
||||
[Dependency] private readonly IUserInterfaceManager _uiManager = default!;
|
||||
[Dependency] private readonly IReplayRecordingManager _replayRecording = default!;
|
||||
[Dependency] private readonly ExamineSystemShared _examine = default!;
|
||||
|
||||
public IReadOnlyList<WorldPopupLabel> WorldLabels => _aliveWorldLabels;
|
||||
public IReadOnlyList<CursorPopupLabel> CursorLabels => _aliveCursorLabels;
|
||||
@@ -51,6 +53,7 @@ namespace Content.Client.Popups
|
||||
_prototype,
|
||||
_uiManager,
|
||||
_uiManager.GetUIController<PopupUIController>(),
|
||||
_examine,
|
||||
this));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user