From c0974d2774e9a20a8facbb7ae30436638efa36d5 Mon Sep 17 00:00:00 2001 From: Amy <3855802+amylizzle@users.noreply.github.com> Date: Mon, 27 May 2024 18:17:22 +0100 Subject: [PATCH] Update RT to 223.1.2 (#1810) Co-authored-by: amylizzle --- OpenDreamClient/Input/MouseInputSystem.cs | 6 ++++++ RobustToolbox | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/OpenDreamClient/Input/MouseInputSystem.cs b/OpenDreamClient/Input/MouseInputSystem.cs index 3942ad26fb..e2e846aaca 100644 --- a/OpenDreamClient/Input/MouseInputSystem.cs +++ b/OpenDreamClient/Input/MouseInputSystem.cs @@ -8,6 +8,8 @@ using Robust.Client.Graphics; using Robust.Client.Input; using Robust.Client.UserInterface; +using Robust.Shared; +using Robust.Shared.Configuration; using Robust.Shared.Input; using Robust.Shared.Input.Binding; using Robust.Shared.Map; @@ -22,6 +24,7 @@ internal sealed class MouseInputSystem : SharedMouseInputSystem { [Dependency] private readonly EntityLookupSystem _lookupSystem = default!; [Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly MapSystem _mapSystem = default!; + [Dependency] private readonly IConfigurationManager _configurationManager = default!; private DreamViewOverlay? _dreamViewOverlay; private ContextMenuPopup _contextMenu = default!; @@ -84,6 +87,9 @@ public void HandleStatClick(string atomRef, bool isMiddle) { var mapCoords = viewport.ScreenToMap(args.PointerLocation.Position); var mousePos = (args.RelativePixelPosition - viewportBox.TopLeft) / viewportBox.Size * viewport.ViewportSize; + + if(_configurationManager.GetCVar(CVars.DisplayCompat)) + return null; //Compat mode causes crashes with RT's GetPixel because OpenGL ES doesn't support GetTexImage() var lookupColor = _dreamViewOverlay.MouseMap.GetPixel((int)mousePos.X, (int)mousePos.Y); var underMouse = _dreamViewOverlay.MouseMapLookup.GetValueOrDefault(lookupColor); if (underMouse == null) diff --git a/RobustToolbox b/RobustToolbox index ec794ce4e4..796abe1230 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit ec794ce4e4693069d3b3ebf7a88ead5ff2f860e0 +Subproject commit 796abe1230554c31daffbfa6559a0a4bcf50b1af