From: havoc Date: Fri, 30 Mar 2007 03:33:29 +0000 (+0000) Subject: fix bug that caused blood stainmaps to not appear when decals were off X-Git-Tag: xonotic-v0.1.0preview~3393 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=3200f5ba89ab6b9946da94c69f4a89b2d123e61e;ds=sidebyside fix bug that caused blood stainmaps to not appear when decals were off git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7025 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/cl_particles.c b/cl_particles.c index 39c714d1..7fec5e9e 100644 --- a/cl_particles.c +++ b/cl_particles.c @@ -1590,6 +1590,8 @@ void CL_MoveParticles (void) p->type = NULL; continue; } + if (cl_stainmaps.integer) + R_Stain(p->org, 32, 32, 16, 16, (int)(p->alpha * p->size * (1.0f / 40.0f)), 192, 48, 48, (int)(p->alpha * p->size * (1.0f / 40.0f))); if (!cl_decals.integer) { p->type = NULL; @@ -1598,8 +1600,6 @@ void CL_MoveParticles (void) // convert from a blood particle to a blood decal VectorCopy(trace.plane.normal, p->vel); VectorAdd(p->org, p->vel, p->org); - if (cl_stainmaps.integer) - R_Stain(p->org, 32, 32, 16, 16, (int)(p->alpha * p->size * (1.0f / 40.0f)), 192, 48, 48, (int)(p->alpha * p->size * (1.0f / 40.0f))); p->type = particletype + pt_decal; p->texnum = tex_blooddecal[rand()&7];