X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=cl_screen.c;h=e4ba43d90301a49d84a77c15c2b7776409deadd1;hb=d3b8dc6b859c81a72fa1ea2cccb5064a319c32fc;hp=d815074766c1096c106aeb6d9f5dce6fb0ea69db;hpb=a2bb7fbbe9c477aaa2ebb4d9aaa2fa0423dd6f0a;p=xonotic%2Fdarkplaces.git

diff --git a/cl_screen.c b/cl_screen.c
index d8150747..e4ba43d9 100644
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -2326,16 +2326,12 @@ void CL_UpdateScreen(void)
 
 	qglFlush(); // ensure that the commands are submitted to the GPU before we do other things
 
-	if (!vid_activewindow)
-		VID_SetMouse(false, false, false);
-	else if (key_consoleactive)
-		VID_SetMouse(vid.fullscreen, false, false);
-	else if (key_dest == key_menu_grabbed)
-		VID_SetMouse(true, vid_mouse.integer && !in_client_mouse && !vid_touchscreen.integer, !vid_touchscreen.integer);
-	else if (key_dest == key_menu)
-		VID_SetMouse(vid.fullscreen, vid_mouse.integer && !in_client_mouse && !vid_touchscreen.integer, !vid_touchscreen.integer);
+	if (!vid_activewindow || key_consoleactive)
+		VID_SetMouse(false, false);
+	else if (key_dest == key_menu || key_dest == key_menu_grabbed || scr_loading)
+		VID_SetMouse(vid_mouse.integer && !in_client_mouse && !vid_touchscreen.integer, !vid_touchscreen.integer);
 	else
-		VID_SetMouse(vid.fullscreen, vid_mouse.integer && !cl.csqc_wantsmousemove && cl_prydoncursor.integer <= 0 && (!cls.demoplayback || cl_demo_mousegrab.integer) && !vid_touchscreen.integer, !vid_touchscreen.integer);
+		VID_SetMouse(vid_mouse.integer && !cl.csqc_wantsmousemove && cl_prydoncursor.integer <= 0 && (!cls.demoplayback || cl_demo_mousegrab.integer) && !vid_touchscreen.integer, !vid_touchscreen.integer);
 
 	VID_Finish();
 }