don't draw glow twice when gl_combine is on

[xonotic/darkplaces.git] / r_crosshairs.c

diff --git a/r_crosshairs.c b/r_crosshairs.c
index 6cd5cfae0d427993f9679ae3c6f962b07baa3412..2b61af1001ad0c62f72f565edb4b4067a2665e97 100644 (file)
--- a/r_crosshairs.c
+++ b/r_crosshairs.c
@@ -62,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;
@@ -69,7 +71,7 @@ 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));
+       pic = Draw_CachePic(va("gfx/crosshair%i.tga", num), true);
        if (!pic)
                return;
        R_GetCrosshairColor(color);
@@ -80,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, true, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_SKY) * (8192.0f / 40.0f) * crosshair_size.value;
 
        // draw the sprite
-       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]);
+       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)
@@ -93,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;
@@ -100,7 +104,7 @@ void R_Draw2DCrosshair(void)
                return;
        if (!cl.viewentity || !cl_entities[cl.viewentity].state_current.active)
                return;
-       pic = Draw_CachePic(va("gfx/crosshair%i.tga", num));
+       pic = Draw_CachePic(va("gfx/crosshair%i.tga", num), true);
        if (pic)
        {
                R_GetCrosshairColor(color);