From: ndren <andreien@proton.me>
Date: Sat, 24 Dec 2022 08:38:30 +0000 (+0000)
Subject: Set and unset relative mouse mode where necessary (#12636)
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=62ee02b8bae50f519bf88c2b7a8b22bb179f6241;p=minetest.git

Set and unset relative mouse mode where necessary (#12636)

* Set and unset relative mouse mode where necessary

Co-authored-by: sfan5 <sfan5@live.de>
---

diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp
index 514607fc3..94d2a38c9 100644
--- a/src/client/clientlauncher.cpp
+++ b/src/client/clientlauncher.cpp
@@ -552,6 +552,10 @@ void ClientLauncher::main_menu(MainMenuData *menudata)
 #ifndef ANDROID
 	m_rendering_engine->get_raw_device()->getCursorControl()->setVisible(true);
 #endif
+	// Set absolute mouse mode
+#if IRRLICHT_VERSION_MT_REVISION >= 9
+	m_rendering_engine->get_raw_device()->getCursorControl()->setRelativeMode(false);
+#endif
 
 	/* show main menu */
 	GUIEngine mymenu(&input->joystick, guiroot, m_rendering_engine, &g_menumgr, menudata, *kill);
diff --git a/src/client/game.cpp b/src/client/game.cpp
index fc911fc03..e7fc31774 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -2520,6 +2520,12 @@ void Game::checkZoomEnabled()
 
 void Game::updateCameraDirection(CameraOrientation *cam, float dtime)
 {
+#if IRRLICHT_VERSION_MT_REVISION >= 9
+	if (isMenuActive())
+		device->getCursorControl()->setRelativeMode(false);
+	else
+		device->getCursorControl()->setRelativeMode(true);
+#endif
 	if ((device->isWindowActive() && device->isWindowFocused()
 			&& !isMenuActive()) || input->isRandom()) {