more q3bsp work (and no it still doesn't work right)

[xonotic/darkplaces.git] / r_crosshairs.c

diff --git a/r_crosshairs.c b/r_crosshairs.c
index 5522a2886c49b62c8952f8cfd4f67bf8df10d608..6cd5cfae0d427993f9679ae3c6f962b07baa3412 100644 (file)
--- a/r_crosshairs.c
+++ b/r_crosshairs.c
@@ -22,45 +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);
-       varray_texcoord[0][ 0] = 0;varray_texcoord[0][ 1] = 0;
-       varray_texcoord[0][ 4] = 0;varray_texcoord[0][ 5] = 1;
-       varray_texcoord[0][ 8] = 1;varray_texcoord[0][ 9] = 1;
-       varray_texcoord[0][12] = 1;varray_texcoord[0][13] = 0;
-       varray_vertex[0] = origin[0] - vright[0] * scale - vup[0] * scale;
-       varray_vertex[1] = origin[1] - vright[1] * scale - vup[1] * scale;
-       varray_vertex[2] = origin[2] - vright[2] * scale - vup[2] * scale;
-       varray_vertex[4] = origin[0] - vright[0] * scale + vup[0] * scale;
-       varray_vertex[5] = origin[1] - vright[1] * scale + vup[1] * scale;
-       varray_vertex[6] = origin[2] - vright[2] * scale + vup[2] * scale;
-       varray_vertex[8] = origin[0] + vright[0] * scale + vup[0] * scale;
-       varray_vertex[9] = origin[1] + vright[1] * scale + vup[1] * scale;
-       varray_vertex[10] = origin[2] + vright[2] * scale + vup[2] * scale;
-       varray_vertex[12] = origin[0] + vright[0] * scale - vup[0] * scale;
-       varray_vertex[13] = origin[1] + vright[1] * scale - vup[1] * scale;
-       varray_vertex[14] = origin[2] + vright[2] * scale - vup[2] * scale;
-       R_Mesh_Draw(4, 2, polygonelements);
-}
-
 void R_GetCrosshairColor(float *out)
 {
        int i;
@@ -121,10 +82,10 @@ void R_DrawWorldCrosshair(void)
        AngleVectors(cl.viewangles, v2, NULL, NULL);
        //VectorCopy(r_origin, 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, vright, vup, spritescale, -spritescale, -spritescale, spritescale, color[0], color[1], color[2], color[3]);
 }
 
 void R_Draw2DCrosshair(void)