also consider vid_mouse cvar when key_dest is key_menu

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8471 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_screen.c b/cl_screen.c
index 95b9fa4617844f2ddecfc8c6d972545d8c6ef8b0..0c05593927e3195fba5a77c47a019311d1a0ff83 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -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);