From 5a30bfc04188dc4a25242c8e3b1576527f2aabc1 Mon Sep 17 00:00:00 2001 From: divverent Date: Sun, 24 Aug 2008 10:19:23 +0000 Subject: [PATCH] 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 --- cl_screen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cl_screen.c b/cl_screen.c index 95b9fa46..0c055939 100644 --- 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); -- 2.39.2