audit of fullscreengrab in VID_SetMouse, getting rid of unnecessary

cases

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

diff --git a/cl_screen.c b/cl_screen.c
index b1f5df21238939571a1463839d083fa050c91907..dad5df859ad278dcd313698e4d9624663bdc89c2 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -2281,7 +2281,7 @@ void CL_UpdateScreen(void)
        else if (key_dest == key_menu)
                VID_SetMouse(vid.fullscreen, !in_client_mouse, true);
        else
-               VID_SetMouse(vid.fullscreen || (vid_mouse.integer && !cls.demoplayback && !cl.csqc_wantsmousemove), vid_mouse.integer && !cls.demoplayback && !cl.csqc_wantsmousemove, true);
+               VID_SetMouse(vid.fullscreen, vid_mouse.integer && !cls.demoplayback && !cl.csqc_wantsmousemove, true);
 
        VID_Finish();
 }

diff --git a/vid_agl.c b/vid_agl.c
index 2648ce27654f032cca4f44bcf1b79a665d5d7de1..88e33a16e68e8a60971561f4af2f8063c49aec89 100644 (file)
--- a/vid_agl.c
+++ b/vid_agl.c
@@ -109,7 +109,7 @@ void VID_GetWindowSize (int *x, int *y, int *width, int *height)
 void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecursor)
 {
        if (!mouse_avail || !window)
-               fullscreengrab = relative = hidecursor = false;
+               relative = hidecursor = false;
 
        if (relative)
        {