this one is obvious: get rid of -gl_driver option in a -DANTICHEAT compile

diff --git a/vid_glx.c b/vid_glx.c
index 5b77483f71c54454c38d7487f045997e018d1a1b..b14bd137e82221c855d392dec58b2ae60bc9abfa 100644 (file)
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -1335,12 +1335,15 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode)
 #else
        drivername = "libGL.so.1";
 #endif
+
+#ifndef ANTICHEAT
 // COMMANDLINEOPTION: Linux GLX: -gl_driver <drivername> selects a GL driver library, default is libGL.so.1, useful only for using fxmesa or similar, if you don't know what this is for, you don't need it
 // COMMANDLINEOPTION: BSD GLX: -gl_driver <drivername> selects a GL driver library, default is libGL.so.1, useful only for using fxmesa or similar, if you don't know what this is for, you don't need it
 // LordHavoc: although this works on MacOSX, it's useless there (as there is only one system libGL)
        i = COM_CheckParm("-gl_driver");
        if (i && i < com_argc - 1)
                drivername = com_argv[i + 1];
+#endif
        if (!GL_OpenLibrary(drivername))
        {
                Con_Printf("Unable to load GL driver \"%s\"\n", drivername);

diff --git a/vid_sdl.c b/vid_sdl.c
index 9484f6c2427c9459f9771e0397f2404a2311fc55..2c58f9d6b45e8887125773e511cd1be5d2b30c84 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -2049,10 +2049,13 @@ static qboolean VID_InitModeGL(viddef_mode_t *mode)
        // SDL usually knows best
        drivername = NULL;
 
+#ifndef ANTICHEAT
 // COMMANDLINEOPTION: SDL GL: -gl_driver <drivername> selects a GL driver library, default is whatever SDL recommends, useful only for 3dfxogl.dll/3dfxvgl.dll or fxmesa or similar, if you don't know what this is for, you don't need it
        i = COM_CheckParm("-gl_driver");
        if (i && i < com_argc - 1)
                drivername = com_argv[i + 1];
+#endif
+
        if (SDL_GL_LoadLibrary(drivername) < 0)
        {
                Con_Printf("Unable to load GL driver \"%s\": %s\n", drivername, SDL_GetError());

diff --git a/vid_wgl.c b/vid_wgl.c
index cb74dea9357b714510a3a5a70c2f372b09e28fcb..2d75f1ffcc920e471456f373745890999ab8afb1 100644 (file)
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -993,10 +993,14 @@ qboolean VID_InitModeGL(viddef_mode_t *mode)
        *af = 0;
 
        gldrivername = "opengl32.dll";
+
+#ifndef ANTICHEAT
 // COMMANDLINEOPTION: Windows WGL: -gl_driver <drivername> selects a GL driver library, default is opengl32.dll, useful only for 3dfxogl.dll or 3dfxvgl.dll, if you don't know what this is for, you don't need it
        i = COM_CheckParm("-gl_driver");
        if (i && i < com_argc - 1)
                gldrivername = com_argv[i + 1];
+#endif
+
        if (!GL_OpenLibrary(gldrivername))
        {
                Con_Printf("Unable to load GL driver %s\n", gldrivername);