a big change with a little description...

[xonotic/darkplaces.git] / r_sprites.c

diff --git a/r_sprites.c b/r_sprites.c
index db8e90e934c588cec1ac93d852b5a2d72c9c1330..95facc3cf94c10c7be87ab5f30d0028228254d39 100644 (file)
--- a/r_sprites.c
+++ b/r_sprites.c
@@ -4,7 +4,7 @@ void GL_DrawSpriteImage (mspriteframe_t *frame, vec3_t origin, vec3_t up, vec3_t
 {
        byte alphaub;
        alphaub = bound(0, alpha, 255);
-       transpolybegin(R_GetTexture(frame->texture), 0, R_GetTexture(frame->fogtexture), currententity->effects & EF_ADDITIVE ? TPOLYTYPE_ADD : TPOLYTYPE_ALPHA);
+       transpolybegin(R_GetTexture(frame->texture), 0, R_GetTexture(frame->fogtexture), currententity->render.effects & EF_ADDITIVE ? TPOLYTYPE_ADD : TPOLYTYPE_ALPHA);
        transpolyvertub(origin[0] + frame->down * up[0] + frame->left * right[0], origin[1] + frame->down * up[1] + frame->left * right[1], origin[2] + frame->down * up[2] + frame->left * right[2], 0, 1, red, green, blue, alphaub);
        transpolyvertub(origin[0] + frame->up * up[0] + frame->left * right[0], origin[1] + frame->up * up[1] + frame->left * right[1], origin[2] + frame->up * up[2] + frame->left * right[2], 0, 0, red, green, blue, alphaub);
        transpolyvertub(origin[0] + frame->up * up[0] + frame->right * right[0], origin[1] + frame->up * up[1] + frame->right * right[1], origin[2] + frame->up * up[2] + frame->right * right[2], 1, 0, red, green, blue, alphaub);
@@ -29,34 +29,34 @@ void R_DrawSpriteModel (entity_t *e, frameblend_t *blend)
 
        c_sprites++;
 
-       psprite = Mod_Extradata(e->model);
+       psprite = Mod_Extradata(e->render.model);
        //psprite = e->model->cache.data;
 
        if (psprite->type == SPR_ORIENTED)
        {       // bullet marks on walls
-               AngleVectors (e->angles, NULL, right, up);
-               VectorSubtract(e->origin, vpn, org);
+               AngleVectors (e->render.angles, NULL, right, up);
+               VectorSubtract(e->render.origin, vpn, org);
        }
        else
        {       // normal sprite
                VectorCopy(vup, up);
                VectorCopy(vright, right);
-               VectorCopy(e->origin, org);
+               VectorCopy(e->render.origin, org);
        }
-       if (e->scale != 1)
+       if (e->render.scale != 1)
        {
-               VectorScale(up, e->scale, up);
-               VectorScale(right, e->scale, right);
+               VectorScale(up, e->render.scale, up);
+               VectorScale(right, e->render.scale, right);
        }
 
-       if (e->model->flags & EF_FULLBRIGHT || e->effects & EF_FULLBRIGHT)
+       if (e->render.model->flags & EF_FULLBRIGHT || e->render.effects & EF_FULLBRIGHT)
        {
-               color[0] = e->colormod[0] * 255;
-               color[1] = e->colormod[1] * 255;
-               color[2] = e->colormod[2] * 255;
+               color[0] = e->render.colormod[0] * 255;
+               color[1] = e->render.colormod[1] * 255;
+               color[2] = e->render.colormod[2] * 255;
        }
        else
-               R_CompleteLightPoint(color, e->origin, true);
+               R_CompleteLightPoint(color, e->render.origin, true);
 
        colorub[0] = bound(0, color[0], 255);
        colorub[1] = bound(0, color[1], 255);
@@ -64,12 +64,12 @@ void R_DrawSpriteModel (entity_t *e, frameblend_t *blend)
 
        // LordHavoc: interpolated sprite rendering
        if (blend[0].lerp)
-               GL_DrawSpriteImage(((mspriteframe_t *)(psprite->ofs_frames + (int) psprite)) + blend[0].frame, org, up, right, colorub[0],colorub[1],colorub[2], e->alpha*255*blend[0].lerp);
+               GL_DrawSpriteImage(((mspriteframe_t *)(psprite->ofs_frames + (int) psprite)) + blend[0].frame, org, up, right, colorub[0],colorub[1],colorub[2], e->render.alpha*255*blend[0].lerp);
        if (blend[1].lerp)
-               GL_DrawSpriteImage(((mspriteframe_t *)(psprite->ofs_frames + (int) psprite)) + blend[1].frame, org, up, right, colorub[0],colorub[1],colorub[2], e->alpha*255*blend[1].lerp);
+               GL_DrawSpriteImage(((mspriteframe_t *)(psprite->ofs_frames + (int) psprite)) + blend[1].frame, org, up, right, colorub[0],colorub[1],colorub[2], e->render.alpha*255*blend[1].lerp);
        if (blend[2].lerp)
-               GL_DrawSpriteImage(((mspriteframe_t *)(psprite->ofs_frames + (int) psprite)) + blend[2].frame, org, up, right, colorub[0],colorub[1],colorub[2], e->alpha*255*blend[2].lerp);
+               GL_DrawSpriteImage(((mspriteframe_t *)(psprite->ofs_frames + (int) psprite)) + blend[2].frame, org, up, right, colorub[0],colorub[1],colorub[2], e->render.alpha*255*blend[2].lerp);
        if (blend[3].lerp)
-               GL_DrawSpriteImage(((mspriteframe_t *)(psprite->ofs_frames + (int) psprite)) + blend[3].frame, org, up, right, colorub[0],colorub[1],colorub[2], e->alpha*255*blend[3].lerp);
+               GL_DrawSpriteImage(((mspriteframe_t *)(psprite->ofs_frames + (int) psprite)) + blend[3].frame, org, up, right, colorub[0],colorub[1],colorub[2], e->render.alpha*255*blend[3].lerp);
 }