made dland2.wav not play in GAME_NEXUIZ

[xonotic/darkplaces.git] / r_crosshairs.c

diff --git a/r_crosshairs.c b/r_crosshairs.c
index 12ca524bfe462ef19d253e3708bb5dc68a7fa316..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);
@@ -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);