also consider vid_mouse cvar when key_dest is key_menu

[xonotic/darkplaces.git] / cl_screen.c

diff --git a/cl_screen.c b/cl_screen.c
index 9b8404cfba087a7e512478164316c1959b97a4bf..0c05593927e3195fba5a77c47a019311d1a0ff83 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -589,7 +589,7 @@ static int SCR_InfobarHeight()
 SCR_InfoBar_f
 ==============
 */
-void SCR_InfoBar_f()
+void SCR_InfoBar_f(void)
 {
        if(Cmd_Argc() == 3)
        {
@@ -2327,9 +2327,9 @@ void CL_UpdateScreen(void)
        else if (key_consoleactive)
                VID_SetMouse(vid.fullscreen, false, false);
        else if (key_dest == key_menu_grabbed)
-               VID_SetMouse(true, !in_client_mouse, true);
+               VID_SetMouse(true, vid_mouse.integer && !in_client_mouse, true);
        else if (key_dest == key_menu)
-               VID_SetMouse(vid.fullscreen, !in_client_mouse, true);
+               VID_SetMouse(vid.fullscreen, vid_mouse.integer && !in_client_mouse, true);
        else
                VID_SetMouse(vid.fullscreen, vid_mouse.integer && !cls.demoplayback && !cl.csqc_wantsmousemove, true);