X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=r_crosshairs.c;h=12ca524bfe462ef19d253e3708bb5dc68a7fa316;hb=e526d9653bdf0d6783d4383ec0c3528fd4a487b2;hp=ba08ed9cbebb4aa51f00b64a39b2d275543dc01b;hpb=224f9edae92441767654e2c10eb568bb91f86eb1;p=xonotic%2Fdarkplaces.git

diff --git a/r_crosshairs.c b/r_crosshairs.c
index ba08ed9c..12ca524b 100644
--- 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;
@@ -103,12 +80,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)