fixed gl_combine so it is enabled by default (if present)

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

diff --git a/vid_shared.c b/vid_shared.c
index f582b6fc89dd0d17f55fc99f63d3ccb91d76eae7..cda7de6361ca64b66df8f2fdd99cf94c1a78cca9 100644 (file)
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -15,7 +15,7 @@ int gl_supportslockarrays = false;
 cvar_t vid_mode = {0, "vid_mode", "0"};
 cvar_t vid_mouse = {CVAR_SAVE, "vid_mouse", "1"};
 cvar_t vid_fullscreen = {0, "vid_fullscreen", "1"};
-cvar_t gl_combine = {0, "gl_combine", "0"};
+cvar_t gl_combine = {0, "gl_combine", "1"};
 
 // GL_ARB_multitexture
 void (GLAPIENTRY *qglMultiTexCoord2f) (GLenum, GLfloat, GLfloat);
@@ -122,27 +122,6 @@ void VID_CheckExtensions(void)
 #endif
 }
 
-/*
-void VID_CheckCombine(void)
-{
-       // LordHavoc: although texture_env_combine doesn't require multiple TMUs
-       // (it does require the multitexture extension however), it is useless to
-       // darkplaces without multiple TMUs...
-       if (gl_mtexable && strstr(gl_extensions, "GL_ARB_texture_env_combine "))
-       {
-               gl_combine_extension = true;
-               Cvar_SetValue("gl_combine", true);
-               Con_Printf("GL_ARB_texture_env_combine detected\n");
-       }
-       else
-       {
-               gl_combine_extension = false;
-               Cvar_SetValue("gl_combine", false);
-               Con_Printf("GL_ARB_texture_env_combine not detected\n");
-       }
-}
-*/
-
 void Force_CenterView_f (void)
 {
        cl.viewangles[PITCH] = 0;