fix for serious bug in .nodrawtoclient, .drawonlytoclient, and .viewmodelforclient...

[xonotic/darkplaces.git] / gl_warp.c

diff --git a/gl_warp.c b/gl_warp.c
index 1dd2b28baf5dc388419804583344b0fd899d73e4..5bf52b35ac45df99c86a04f3cc4a61219c2c9be5 100644 (file)
--- a/gl_warp.c
+++ b/gl_warp.c
@@ -246,7 +246,7 @@ void LoadSky_f (void)
        }
 }
 
-extern cvar_t r_skyboxsize;
+extern cvar_t r_farclip;
 
 #define R_SkyBoxPolyVec(s,t,x,y,z) \
        glTexCoord2f((s) * (254.0f/256.0f) + (1.0f/256.0f), (t) * (254.0f/256.0f) + (1.0f/256.0f));\
@@ -304,6 +304,7 @@ void R_SkyBox()
        glEnd();
 }
 
+/*
 float skydomeouter[33*33*3];
 float skydomeinner[33*33*3];
 unsigned short skydomeindices[32*66];
@@ -403,15 +404,18 @@ void R_SkyDome()
        skydome(skydomeinner, speedscale, 1.0 / 128.0);
        glDisable (GL_BLEND);
 }
+*/
 
 void R_Sky()
 {
+       if (!skyname[0])
+               return;
        glDisable(GL_DEPTH_TEST);
        glDepthMask(0);
-       if (skyname[0])
+//     if (skyname[0])
                R_SkyBox();
-       else // classic quake sky
-               R_SkyDome();
+//     else // classic quake sky
+//             R_SkyDome();
        glDepthMask(1);
        glEnable (GL_DEPTH_TEST);
        glColor3f (1,1,1);
@@ -435,7 +439,6 @@ void R_InitSky (byte *src, int bytesperpixel) //texture_t *mt)
        unsigned        transpix;
        int                     r, g, b;
        unsigned        *rgba;
-       extern  int                     skytexturenum;
 
 //     src = (byte *)mt + mt->offsets[0];