now compiles on x86_64 successfully (still a crash regarding progs strings to fix...

[xonotic/darkplaces.git] / r_sprites.c

diff --git a/r_sprites.c b/r_sprites.c
index 5529c24eff262c1559895c02b3761ebf8c2fc44b..f3c8a33a1bf5df8ec79d46fcafcfef3012e203dc 100644 (file)
--- a/r_sprites.c
+++ b/r_sprites.c
@@ -91,7 +91,7 @@ void R_DrawSpriteModelCallback(const void *calldata1, int calldata2)
 
        R_Mesh_Matrix(&r_identitymatrix);
 
-       if ((ent->model->flags & EF_FULLBRIGHT) || (ent->effects & EF_FULLBRIGHT))
+       if (!(ent->flags & RENDER_LIGHT))
                color[0] = color[1] = color[2] = 1;
        else
        {
@@ -118,7 +118,7 @@ void R_DrawSpriteModelCallback(const void *calldata1, int calldata2)
                        if (ent->frameblend[i].lerp >= 0.01f)
                        {
                                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);
+                               R_DrawSpriteImage((ent->effects & 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,9 +131,12 @@ void R_DrawSpriteModelCallback(const void *calldata1, int calldata2)
                for (i = 0;i < 4 && ent->frameblend[i].lerp;i++)
                        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)
-                       R_DrawSpriteImage(true, frame, frame->fogtexture, org, up, left, fogcolor[0],fogcolor[1],fogcolor[2], fog * ent->alpha);
+               if (frame)
+               {
+                       R_DrawSpriteImage((ent->effects & 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)
+                               R_DrawSpriteImage(true, frame, frame->fogtexture, org, up, left, fogcolor[0],fogcolor[1],fogcolor[2], fog * ent->alpha);
+               }
        }
 }
 
@@ -144,6 +147,6 @@ void R_Model_Sprite_Draw(entity_render_t *ent)
 
        c_sprites++;
 
-       R_MeshQueue_AddTransparent(ent->origin, R_DrawSpriteModelCallback, ent, 0);
+       R_MeshQueue_AddTransparent(ent->effects & EF_NODEPTHTEST ? r_vieworigin : ent->origin, R_DrawSpriteModelCallback, ent, 0);
 }