X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=r_sprites.c;h=16b493be189b46fb2b9a1b2f7e1757661f9274f9;hb=ad09ce8c5c329628d46ae8e6ba596e5cb5c37cc6;hp=5529c24eff262c1559895c02b3761ebf8c2fc44b;hpb=b3d06ef63c3d500d9ebf32a8abf3ae7a23ee30dd;p=xonotic%2Fdarkplaces.git

diff --git a/r_sprites.c b/r_sprites.c
index 5529c24e..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)
@@ -91,13 +91,16 @@ 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
 	{
-		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) || (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), (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);
 			}
 		}
 	}
@@ -131,9 +134,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), (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, (ent->effects & EF_NODEPTHTEST), frame, frame->fogtexture, org, up, left, fogcolor[0],fogcolor[1],fogcolor[2], fog * ent->alpha);
+		}
 	}
 }
 
@@ -144,6 +150,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);
 }