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

Fix #1048 (#1067)

Browse Source
This commit is contained in:
Clyybber
2020-06-02 15:52:41 +02:00
committed by GitHub
parent a09131e817
commit 2301d8faae
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/State/GameScreenBase.cs
View File

@@ -8,6 +8,7 @@ using Robust.Client.Interfaces.GameObjects;
using Robust.Client.Interfaces.GameObjects.Components; using Robust.Client.Interfaces.GameObjects.Components;
using Robust.Client.Interfaces.Graphics.ClientEye; using Robust.Client.Interfaces.Graphics.ClientEye;
using Robust.Client.Interfaces.Input; using Robust.Client.Interfaces.Input;
using Robust.Client.Interfaces.UserInterface;
using Robust.Client.Player; using Robust.Client.Player;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Input; using Robust.Shared.Input;
@@ -33,6 +34,7 @@ namespace Content.Client.State
[Dependency] private readonly IEntitySystemManager _entitySystemManager; [Dependency] private readonly IEntitySystemManager _entitySystemManager;
[Dependency] private readonly IGameTiming _timing; [Dependency] private readonly IGameTiming _timing;
[Dependency] private readonly IMapManager _mapManager; [Dependency] private readonly IMapManager _mapManager;
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager;
#pragma warning restore 649 #pragma warning restore 649
private IEntity _lastHoveredEntity; private IEntity _lastHoveredEntity;
@@ -51,8 +53,8 @@ namespace Content.Client.State
{ {
base.FrameUpdate(e); base.FrameUpdate(e);
var mousePosWorld = _eyeManager.ScreenToWorld(new ScreenCoordinates(_inputManager.MouseScreenPosition)); var mousePosWorld = _eyeManager.ScreenToWorld(_inputManager.MouseScreenPosition);
var entityToClick = GetEntityUnderPosition(mousePosWorld); var entityToClick = _userInterfaceManager.CurrentlyHovered != null ? null : GetEntityUnderPosition(mousePosWorld);
var inRange = false; var inRange = false;
if (_playerManager.LocalPlayer.ControlledEntity != null && entityToClick != null) if (_playerManager.LocalPlayer.ControlledEntity != null && entityToClick != null)