changed lhrandom to use the full RAND_MAX limit (more random, after all the low bits...

[xonotic/darkplaces.git] / r_crosshairs.c

diff --git a/r_crosshairs.c b/r_crosshairs.c
index ba08ed9cbebb4aa51f00b64a39b2d275543dc01b..bf5018bb46cb7d35caa71d12a9282bd516f418b3 100644 (file)
--- a/r_crosshairs.c
+++ b/r_crosshairs.c
@@ -22,29 +22,6 @@ void R_Crosshairs_Init(void)
        Cvar_RegisterVariable(&crosshair_static);
 }
 
-void R_DrawCrosshairSprite(rtexture_t *texture, vec3_t origin, vec_t scale, float cr, float cg, float cb, float ca)
-{
-       rmeshstate_t m;
-       float diff[3];
-
-       if (fogenabled)
-       {
-               VectorSubtract(origin, r_origin, diff);
-               ca *= 1 - exp(fogdensity/DotProduct(diff,diff));
-       }
-
-       memset(&m, 0, sizeof(m));
-       m.blendfunc1 = GL_SRC_ALPHA;
-       m.blendfunc2 = GL_ONE;
-       m.depthdisable = true;
-       m.tex[0] = R_GetTexture(texture);
-       R_Mesh_Matrix(&r_identitymatrix);
-       R_Mesh_State(&m);
-
-       GL_Color(cr * r_colorscale, cg * r_colorscale, cb * r_colorscale, ca);
-       R_DrawSpriteMesh(origin, vright, vup, scale, -scale, -scale, scale);
-}
-
 void R_GetCrosshairColor(float *out)
 {
        int i;
@@ -85,6 +62,8 @@ void R_DrawWorldCrosshair(void)
        vec3_t v1, v2, spriteorigin;
        vec_t spritescale;
        vec4_t color;
+       if (r_letterbox.value)
+               return;
        if (crosshair_static.integer)
                return;
        num = crosshair.integer;
@@ -103,12 +82,12 @@ void R_DrawWorldCrosshair(void)
 
        // get the forward vector for the gun (not the view)
        AngleVectors(cl.viewangles, v2, NULL, NULL);
-       //VectorCopy(r_origin, v1);
+       //VectorCopy(r_vieworigin, v1);
        VectorMA(v1, 8192, v2, v2);
-       spritescale = CL_TraceLine(v1, v2, spriteorigin, NULL, 0, true, NULL) * (8192.0f / 40.0f) * crosshair_size.value;
+       spritescale = CL_TraceLine(v1, v2, spriteorigin, NULL, true, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_SKY) * (8192.0f / 40.0f) * crosshair_size.value;
 
        // draw the sprite
-       R_DrawCrosshairSprite(pic->tex, spriteorigin, spritescale, color[0], color[1], color[2], color[3]);
+       R_DrawSprite(GL_SRC_ALPHA, GL_ONE, pic->tex, true, spriteorigin, r_viewright, r_viewup, spritescale, -spritescale, -spritescale, spritescale, color[0], color[1], color[2], color[3]);
 }
 
 void R_Draw2DCrosshair(void)
@@ -116,6 +95,8 @@ void R_Draw2DCrosshair(void)
        int num;
        cachepic_t *pic;
        vec4_t color;
+       if (r_letterbox.value)
+               return;
        if (!crosshair_static.integer)
                return;
        num = crosshair.integer;