X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=r_sprites.c;h=16b493be189b46fb2b9a1b2f7e1757661f9274f9;hb=e34ab8ae58da95d01a976bba6c3b965df2375730;hp=f3c8a33a1bf5df8ec79d46fcafcfef3012e203dc;hpb=c0fc61aa52c16eb776e0f0ae1d2f63a927eb50ca;p=xonotic%2Fdarkplaces.git

diff --git a/r_sprites.c b/r_sprites.c
index f3c8a33a..16b493be 100644
--- 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)
@@ -95,9 +95,12 @@ void R_DrawSpriteModelCallback(const void *calldata1, int calldata2)
 		color[0] = color[1] = color[2] = 1;
 	else
 	{
-		R_CompleteLightPoint(color, diffusecolor, diffusenormal, ent->origin, true, NULL);
+		R_CompleteLightPoint(color, diffusecolor, diffusenormal, ent->origin, true);
 		VectorMA(color, 0.5f, diffusecolor, color);
 	}
+	color[0] *= ent->colormod[0];
+	color[1] *= ent->colormod[1];
+	color[2] *= ent->colormod[2];
 
 	if (fogenabled)
 	{
@@ -118,9 +121,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 +136,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);
 		}
 	}
 }