sprites now work with EF_NODEPTHTEST

[xonotic/darkplaces.git] / r_sprites.c

diff --git a/r_sprites.c b/r_sprites.c
index f3c8a33a1bf5df8ec79d46fcafcfef3012e203dc..9868ff4887c1498292a605755436c509f6a78ffa 100644 (file)
--- a/r_sprites.c
+++ b/r_sprites.c
@@ -71,10 +71,10 @@ static int R_SpriteSetup (const entity_render_t *ent, int type, float org[3], fl
        return false;
 }
 
-static void R_DrawSpriteImage (int additive, mspriteframe_t *frame, rtexture_t *texture, vec3_t origin, vec3_t up, vec3_t left, float red, float green, float blue, float alpha)
+static void R_DrawSpriteImage (int additive, int depthdisable, mspriteframe_t *frame, rtexture_t *texture, vec3_t origin, vec3_t up, vec3_t left, float red, float green, float blue, float alpha)
 {
        // FIXME: negate left and right in loader
-       R_DrawSprite(GL_SRC_ALPHA, additive ? GL_ONE : GL_ONE_MINUS_SRC_ALPHA, texture, false, origin, left, up, frame->left, frame->right, frame->down, frame->up, red, green, blue, alpha);
+       R_DrawSprite(GL_SRC_ALPHA, additive ? GL_ONE : GL_ONE_MINUS_SRC_ALPHA, texture, depthdisable, origin, left, up, frame->left, frame->right, frame->down, frame->up, red, green, blue, alpha);
 }
 
 void R_DrawSpriteModelCallback(const void *calldata1, int calldata2)
@@ -118,9 +118,9 @@ 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), 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), (ent->effects & EF_NODEPTHTEST), 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);
+                                       R_DrawSpriteImage(true, (ent->effects & EF_NODEPTHTEST), frame, frame->fogtexture, org, up, left, fogcolor[0],fogcolor[1],fogcolor[2], fog * ent->alpha * ent->frameblend[i].lerp);
                        }
                }
        }
@@ -133,9 +133,9 @@ void R_DrawSpriteModelCallback(const void *calldata1, int calldata2)
 
                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);
+                       R_DrawSpriteImage((ent->effects & EF_ADDITIVE), (ent->effects & EF_NODEPTHTEST), 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);
+                               R_DrawSpriteImage(true, (ent->effects & EF_NODEPTHTEST), frame, frame->fogtexture, org, up, left, fogcolor[0],fogcolor[1],fogcolor[2], fog * ent->alpha);
                }
        }
 }