X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=r_crosshairs.c;h=a6dca4b20bb3b90efd1e4c435a7cf3df15d0d1d8;hb=85d7c7f18c78cf77d7d00453338892e042b51eb3;hp=2b61af1001ad0c62f72f565edb4b4067a2665e97;hpb=e5026b6eb290b2098c6ce92ae7b777fb4457227b;p=xonotic%2Fdarkplaces.git

diff --git a/r_crosshairs.c b/r_crosshairs.c
index 2b61af10..a6dca4b2 100644
--- a/r_crosshairs.c
+++ b/r_crosshairs.c
@@ -7,7 +7,7 @@ cvar_t crosshair_alpha = {CVAR_SAVE, "crosshair_alpha", "1"};
 cvar_t crosshair_flashspeed = {CVAR_SAVE, "crosshair_flashspeed", "2"};
 cvar_t crosshair_flashrange = {CVAR_SAVE, "crosshair_flashrange", "0.1"};
 cvar_t crosshair_size = {CVAR_SAVE, "crosshair_size", "1"};
-cvar_t crosshair_static = {CVAR_SAVE, "crosshair_static", "0"};
+cvar_t crosshair_static = {CVAR_SAVE, "crosshair_static", "1"};
 
 // must match NUMCROSSHAIRS in gl_draw.c
 #define NUMCROSSHAIRS 5
@@ -62,6 +62,7 @@ void R_DrawWorldCrosshair(void)
 	vec3_t v1, v2, spriteorigin;
 	vec_t spritescale;
 	vec4_t color;
+	trace_t trace;
 	if (r_letterbox.value)
 		return;
 	if (crosshair_static.integer)
@@ -84,7 +85,9 @@ void R_DrawWorldCrosshair(void)
 	AngleVectors(cl.viewangles, v2, NULL, NULL);
 	//VectorCopy(r_vieworigin, v1);
 	VectorMA(v1, 8192, v2, v2);
-	spritescale = CL_TraceLine(v1, v2, spriteorigin, NULL, true, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_SKY) * (8192.0f / 40.0f) * crosshair_size.value;
+	trace = CL_TraceBox(v1, vec3_origin, vec3_origin, v2, true, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_SKY, false);
+	spritescale = trace.fraction * (8192.0f / 40.0f) * crosshair_size.value;
+	VectorCopy(trace.endpos, spriteorigin);
 
 	// draw the sprite
 	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]);
@@ -108,7 +111,7 @@ void R_Draw2DCrosshair(void)
 	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);
+		DrawQ_Pic((vid_conwidth.integer - pic->width * crosshair_size.value) * 0.5f, (vid_conheight.integer - 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);
 	}
 }