From cd62d8ceca92662b902fbfcf6c1d92895a87446b Mon Sep 17 00:00:00 2001
From: Oznogon <garrett+ozgh@oznogon.com>
Date: Tue, 3 Mar 2026 16:23:49 -0800
Subject: [PATCH] Revert #2494, #2667 for reducing mouse precision

---
 src/screens/crew6/relayScreen.cpp   | 23 -----------------------
 src/screens/crew6/relayScreen.h     |  1 -
 src/screens/gm/gameMasterScreen.cpp | 20 +-------------------
 3 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/src/screens/crew6/relayScreen.cpp b/src/screens/crew6/relayScreen.cpp
index f44502c8c1..bf541c7abe 100644
--- a/src/screens/crew6/relayScreen.cpp
+++ b/src/screens/crew6/relayScreen.cpp
@@ -204,12 +204,6 @@ RelayScreen::RelayScreen(GuiContainer* owner, bool allow_comms)
     }
 }
 
-RelayScreen::~RelayScreen()
-{
-    if (P<MouseRenderer> mouse_renderer = engine->getObject("mouseRenderer"))
-        mouse_renderer->setSpriteImage("mouse.png");
-}
-
 void RelayScreen::onDraw(sp::RenderTarget& renderer)
 {
     ///Handle mouse wheel
@@ -333,21 +327,4 @@ void RelayScreen::onDraw(sp::RenderTarget& renderer)
     }
 
     delete_waypoint_button->setEnable(targets.getWaypointIndex() >= 0);
-
-    if (P<MouseRenderer> mouse_renderer = engine->getObject("mouseRenderer"))
-    {
-        switch(mode)
-        {
-        case TargetSelection:
-        case MoveWaypoint:
-            mouse_renderer->setSpriteImage("mouse.png");
-            break;
-        case WaypointPlacement:
-            mouse_renderer->setSpriteImage("waypoint.png");
-            break;
-        case LaunchProbe:
-            mouse_renderer->setSpriteImage("radar/probe.png");
-            break;
-        }
-    }
 }
diff --git a/src/screens/crew6/relayScreen.h b/src/screens/crew6/relayScreen.h
index c69ddffb77..6d5bec9ff9 100644
--- a/src/screens/crew6/relayScreen.h
+++ b/src/screens/crew6/relayScreen.h
@@ -47,7 +47,6 @@ class RelayScreen : public GuiOverlay
     glm::vec2 mouse_down_position{};
 public:
     RelayScreen(GuiContainer* owner, bool allow_comms);
-    virtual ~RelayScreen();
 
     virtual void onDraw(sp::RenderTarget& target) override;
 };
diff --git a/src/screens/gm/gameMasterScreen.cpp b/src/screens/gm/gameMasterScreen.cpp
index 58f149684a..bec777a0d3 100644
--- a/src/screens/gm/gameMasterScreen.cpp
+++ b/src/screens/gm/gameMasterScreen.cpp
@@ -2,7 +2,6 @@
 #include "i18n.h"
 #include "main.h"
 #include "vectorUtils.h"
-#include "gui/mouseRenderer.h"
 #include "gameGlobalInfo.h"
 #include "objectCreationView.h"
 #include "globalMessageEntryView.h"
@@ -259,10 +258,9 @@ GameMasterScreen::GameMasterScreen(RenderLayer* render_layer)
     gameGlobalInfo->on_gm_click = nullptr;
 }
 
-//due to a suspected compiler bug this deconstructor needs to be explicitly defined
+// Due to a suspected compiler bug this deconstructor needs to be explicitly defined
 GameMasterScreen::~GameMasterScreen()
 {
-    if (P<MouseRenderer> mouse_renderer = engine->getObject("mouseRenderer")) mouse_renderer->setSpriteImage("mouse.png");
 }
 
 void GameMasterScreen::update(float delta)
@@ -443,32 +441,16 @@ void GameMasterScreen::update(float delta)
         message_frame->hide();
     }
 
-    P<MouseRenderer> mouse_renderer = engine->getObject("mouseRenderer");
-
     if (gameGlobalInfo->on_gm_click)
     {
         create_button->hide();
         object_creation_view->hide();
         cancel_action_button->show();
-        if (mouse_renderer)
-        {
-            if (gameGlobalInfo->on_gm_click_cursor == "")
-                mouse_renderer->setSpriteImage(gameGlobalInfo->DEFAULT_ON_GM_CLICK_CURSOR);
-            else
-                mouse_renderer->setSpriteImage(gameGlobalInfo->on_gm_click_cursor);
-        }
     }
     else
     {
         create_button->show();
         cancel_action_button->hide();
-        if (mouse_renderer)
-        {
-            if (SDL_GetModState() & KMOD_CTRL) mouse_renderer->setSpriteImage("mouse_ship.png");
-            else if (SDL_GetModState() & KMOD_ALT) mouse_renderer->setSpriteImage("mouse_faction.png");
-            else if (SDL_GetModState() & KMOD_SHIFT) mouse_renderer->setSpriteImage("mouse_add.png");
-            else mouse_renderer->setSpriteImage("mouse.png");
-        }
     }
 }