simplified dlight fading code

[xonotic/darkplaces.git] / r_sprites.c

diff --git a/r_sprites.c b/r_sprites.c
index 7b5b8e55a604237aebe7ba5bc8700afd2578e30e..8adee274de95d17f2b8200a796d0ff08adcaafad 100644 (file)
--- a/r_sprites.c
+++ b/r_sprites.c
@@ -91,7 +91,7 @@ void R_DrawSpriteModelCallback(const void *calldata1, int calldata2)
        vec3_t diff;
        float fog, ifog;
 
-       if (R_SpriteSetup(ent, ent->model->sprnum_type, org, left, up))
+       if (R_SpriteSetup(ent, ent->model->sprite.sprnum_type, org, left, up))
                return;
 
        R_Mesh_Matrix(&r_identitymatrix);
@@ -119,7 +119,7 @@ void R_DrawSpriteModelCallback(const void *calldata1, int calldata2)
                {
                        if (ent->frameblend[i].lerp >= 0.01f)
                        {
-                               frame = ent->model->sprdata_frames + ent->frameblend[i].frame;
+                               frame = ent->model->sprite.sprdata_frames + ent->frameblend[i].frame;
                                R_DrawSpriteImage((ent->effects & EF_ADDITIVE) || (ent->model->flags & EF_ADDITIVE), frame, frame->texture, org, up, left, color[0] * ifog, color[1] * ifog, color[2] * ifog, ent->alpha * ent->frameblend[i].lerp);
                                if (fog * ent->frameblend[i].lerp >= 0.01f)
                                        R_DrawSpriteImage(true, frame, frame->fogtexture, org, up, left, fogcolor[0],fogcolor[1],fogcolor[2], fog * ent->alpha * ent->frameblend[i].lerp);
@@ -131,7 +131,7 @@ void R_DrawSpriteModelCallback(const void *calldata1, int calldata2)
                // LordHavoc: no interpolation
                frame = NULL;
                for (i = 0;i < 4 && ent->frameblend[i].lerp;i++)
-                       frame = ent->model->sprdata_frames + ent->frameblend[i].frame;
+                       frame = ent->model->sprite.sprdata_frames + ent->frameblend[i].frame;
 
                R_DrawSpriteImage((ent->effects & EF_ADDITIVE) || (ent->model->flags & EF_ADDITIVE), frame, frame->texture, org, up, left, color[0] * ifog, color[1] * ifog, color[2] * ifog, ent->alpha);
                if (fog * ent->frameblend[i].lerp >= 0.01f)