implemented r_glsl_usegeneric cvar, this causes generic GLSL shaders to

[xonotic/darkplaces.git] / vid_sdl.c

diff --git a/vid_sdl.c b/vid_sdl.c
index 52298e0eb81a886963aaa1a9f9fac4fe26555819..959105fbcb310e51d0e5df73291916e5a589eccf 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -241,10 +241,8 @@ static void IN_Activate( qboolean grab )
                if (!vid_usingmouse)
                {
                        vid_usingmouse = true;
-                       cl_ignoremousemove = true;
-                       if(vid_grabkeyboard.integer) {
-                               SDL_WM_GrabInput( SDL_GRAB_ON );
-                       }
+                       cl_ignoremousemoves = 2;
+                       SDL_WM_GrabInput( SDL_GRAB_ON );
                        SDL_ShowCursor( SDL_DISABLE );
                }               
        }
@@ -253,10 +251,8 @@ static void IN_Activate( qboolean grab )
                if (vid_usingmouse)
                {
                        vid_usingmouse = false;
-                       cl_ignoremousemove = true;
-                       if(vid_grabkeyboard.integer) {
-                               SDL_WM_GrabInput( SDL_GRAB_OFF );
-                       }
+                       cl_ignoremousemoves = 2;
+                       SDL_WM_GrabInput( SDL_GRAB_OFF );
                        SDL_ShowCursor( SDL_ENABLE );
                }
        }
@@ -501,6 +497,9 @@ static void VID_SetCaption()
 #endif
        SetClassLongPtr( info.window, GCLP_HICON, (LONG_PTR)icon );
 }
+static void VID_SetIcon()
+{
+}
 #else
 // Adding the OS independent XPM version --blub
 #include "darkplaces.xpm"
@@ -751,8 +750,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate
        vid_activewindow = false;
        vid_usingmouse = false;
 
-       if(!vid_grabkeyboard.integer)
-               SDL_WM_GrabInput(SDL_GRAB_OFF);
+       SDL_WM_GrabInput(SDL_GRAB_OFF);
        return true;
 }