From 36049f2ab2c84aaa4fd12f834593adc1ece12531 Mon Sep 17 00:00:00 2001
From: Pedro Beirao <82064173+Pedro-Beirao@users.noreply.github.com>
Date: Tue, 3 Dec 2024 11:14:34 +0000
Subject: [PATCH] Revert "Release mouse" commits (#542)

* Revert "Release mouse on fullscreen menu"

This reverts commit 3115e9bba51965143e40268b791a2b1902a6a590.

* Revert "Release mouse in intertext and finale"

This reverts commit c9ec9b34405f9d30f4c89ae044d38e01ee11ac47.
---
 prboom2/src/SDL/i_video.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/prboom2/src/SDL/i_video.c b/prboom2/src/SDL/i_video.c
index ac8fae201..b3ac024df 100644
--- a/prboom2/src/SDL/i_video.c
+++ b/prboom2/src/SDL/i_video.c
@@ -1556,6 +1556,11 @@ static dboolean MouseShouldBeGrabbed()
   if (!window_focused)
     return false;
 
+  // always grab the mouse when full screen (dont want to
+  // see the mouse pointer)
+  if (desired_fullscreen)
+    return true;
+
   // if we specify not to grab the mouse, never grab
   if (!mouse_enabled)
     return false;
@@ -1570,8 +1575,7 @@ static dboolean MouseShouldBeGrabbed()
     return false;
 
   // only grab mouse when playing levels (but not demos)
-  return (gamestate == GS_LEVEL || gamestate == GS_INTERMISSION)
-          && !demoplayback && !advancedemo;
+  return !demoplayback;
 }
 
 // Update the value of window_focused when we get a focus event