don't spam joy_active notices with developer_extra

[xonotic/darkplaces.git] / vid_sdl.c

diff --git a/vid_sdl.c b/vid_sdl.c
index 2f9bba72c36a7186009c714a89ef26812b68c3e4..d356150d6dc2e4d8cb4aafb31e327358ceeafe6d 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -1690,7 +1690,8 @@ void VID_EnableJoystick(qboolean enable)
        if (sdlindex >= 0)
                success = true;
 
-       Cvar_SetValueQuick(&joy_active, success ? 1 : 0);
+       if (joy_active.integer != (success ? 1 : 0))
+               Cvar_SetValueQuick(&joy_active, success ? 1 : 0);
 }
 
 #if SETVIDEOMODE
@@ -2151,27 +2152,6 @@ qboolean VID_InitModeGL(viddef_mode_t *mode)
        vid_hasfocus = true;
        vid_usingmouse = false;
        vid_usinghidecursor = false;
-
-       // enable multisampling
-       if (vid_multisampling.integer)
-       {
-               if (vid.support.arb_multisample)
-               {
-                       qglEnable(GL_MULTISAMPLE_ARB);
-                       // it seems that enabling GL_MULTISAMPLE_ARB forces antialiasing to always work, fix the cvar as well
-                       // make sure vid_sample is at least 2 to make things correct
-                       if (vid_samples.integer < 2)
-                               Cvar_SetValueQuick(&vid_samples, 0);    
-               }
-               else
-               {
-                       Cvar_SetValueQuick(&vid_multisampling, 0);
-                       qglDisable(GL_MULTISAMPLE_ARB);
-               }
-       }
-       else
-               qglDisable(GL_MULTISAMPLE_ARB);
-       CHECKGLERROR
                
 #if SETVIDEOMODE
        SDL_WM_GrabInput(SDL_GRAB_OFF);