fix typo

[xonotic/darkplaces.git] / r_crosshairs.c

diff --git a/r_crosshairs.c b/r_crosshairs.c
index dcef703ff43a8212a29afc565f8a32282f4509ff..c47f34b25d5617a5a57c4ca9be9331d089179ae0 100644 (file)
--- a/r_crosshairs.c
+++ b/r_crosshairs.c
@@ -67,7 +67,7 @@ void R_DrawWorldCrosshair(void)
        num = crosshair.integer;
        if (num < 1 || num > NUMCROSSHAIRS || cl.intermission)
                return;
-       if (!cl.viewentity || !cl_entities[cl.viewentity].state_current.active)
+       if (!cl.viewentity || !cl.entities[cl.viewentity].state_current.active)
                return;
        pic = r_crosshairs[num];
        if (!pic)
@@ -75,19 +75,19 @@ void R_DrawWorldCrosshair(void)
        R_GetCrosshairColor(color);
 
        // trace the shot path up to a certain distance
-       Matrix4x4_OriginFromMatrix(&cl_entities[cl.viewentity].render.matrix, v1);
+       Matrix4x4_OriginFromMatrix(&cl.entities[cl.viewentity].render.matrix, 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_vieworigin, v1);
+       //VectorCopy(r_view.origin, v1);
        VectorMA(v1, 8192, v2, v2);
-       trace = CL_TraceBox(v1, vec3_origin, vec3_origin, v2, true, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_SKY, false);
+       trace = CL_TraceBox(v1, vec3_origin, vec3_origin, v2, true, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | 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_MINUS_SRC_ALPHA, pic->tex, NULL, true, spriteorigin, r_viewright, r_viewup, spritescale, -spritescale, -spritescale, spritescale, color[0], color[1], color[2], color[3]);
+       R_DrawSprite(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, pic->tex, NULL, true, spriteorigin, r_view.right, r_view.up, spritescale, -spritescale, -spritescale, spritescale, color[0], color[1], color[2], color[3]);
 }
 
 void R_Draw2DCrosshair(void)
@@ -102,7 +102,7 @@ void R_Draw2DCrosshair(void)
        num = crosshair.integer;
        if (num < 1 || num > NUMCROSSHAIRS || cl.intermission)
                return;
-       if (!cl.viewentity || !cl_entities[cl.viewentity].state_current.active)
+       if (!cl.viewentity || !cl.entities[cl.viewentity].state_current.active)
                return;
        pic = r_crosshairs[num];
        if (pic)