X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_crosshairs.c;h=bf5018bb46cb7d35caa71d12a9282bd516f418b3;hp=438d8549856ac3dbaa0570cbd40c96c900d972a4;hb=c2dbdcd8e1b22d1cda951f2fdae9961f7cb1ba53;hpb=b2b78633cda6e09e3d54d8557a3ed6161355d70f

diff --git a/r_crosshairs.c b/r_crosshairs.c
index 438d8549..bf5018bb 100644
--- a/r_crosshairs.c
+++ b/r_crosshairs.c
@@ -22,52 +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);
-
-	varray_color[0] = varray_color[4] = varray_color[8] = varray_color[12] = cr * r_colorscale;
-	varray_color[1] = varray_color[5] = varray_color[9] = varray_color[13] = cg * r_colorscale;
-	varray_color[2] = varray_color[6] = varray_color[10] = varray_color[14] = cb * r_colorscale;
-	varray_color[3] = varray_color[7] = varray_color[11] = varray_color[15] = ca;
-	varray_texcoord[0][0] = 0;
-	varray_texcoord[0][1] = 0;
-	varray_texcoord[0][2] = 0;
-	varray_texcoord[0][3] = 1;
-	varray_texcoord[0][4] = 1;
-	varray_texcoord[0][5] = 1;
-	varray_texcoord[0][6] = 1;
-	varray_texcoord[0][7] = 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;
@@ -83,7 +37,7 @@ void R_GetCrosshairColor(float *out)
 	}
 	else
 		i = 15;
-	color = (qbyte *) &d_8to24table[i];
+	color = (qbyte *) &palette_complete[i];
 	if (crosshair_flashspeed.value >= 0.01f)
 		base = (sin(realtime * crosshair_flashspeed.value * (M_PI*2.0f)) * crosshair_flashrange.value);
 	else
@@ -108,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;
@@ -115,23 +71,23 @@ void R_DrawWorldCrosshair(void)
 		return;
 	if (!cl.viewentity || !cl_entities[cl.viewentity].state_current.active)
 		return;
-	pic = Draw_CachePic(va("gfx/crosshair%i.tga", num + 1));
+	pic = Draw_CachePic(va("gfx/crosshair%i.tga", num));
 	if (!pic)
 		return;
 	R_GetCrosshairColor(color);
-	
+
 	// trace the shot path up to a certain distance
 	VectorCopy(cl_entities[cl.viewentity].render.origin, v1);
 	v1[2] += 16; // HACK: this depends on the QC
-	
+
 	// 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) * (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)
@@ -139,15 +95,21 @@ 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;
 	if (num < 1 || num > NUMCROSSHAIRS || cl.intermission)
 		return;
-	R_GetCrosshairColor(color);
-	pic = Draw_CachePic(va("gfx/crosshair%i.tga", num + 1));
+	if (!cl.viewentity || !cl_entities[cl.viewentity].state_current.active)
+		return;
+	pic = Draw_CachePic(va("gfx/crosshair%i.tga", num));
 	if (pic)
+	{
+		R_GetCrosshairColor(color);
 		DrawQ_Pic((vid.conwidth - pic->width * crosshair_size.value) * 0.5f, (vid.conheight - pic->height * crosshair_size.value) * 0.5f, pic->name, pic->width * crosshair_size.value, pic->height * crosshair_size.value, color[0], color[1], color[2], color[3], 0);
+	}
 }