qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2024-11-25 13:32:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for a rare particle bug Despair was trying to figure out, minor consistency cleanup, and some comments added.

Browse source
This commit is contained in:
Forest Hale 2001-02-07 08:14:58 +00:00
parent 800ee05584
commit 542457480f
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
source/gl_dyn_part.c
View file

@ -584,6 +584,7 @@ R_DrawParticles (void)
j = 0; j = 0;
for (k = 0, part = particles; k < numparticles; k++, part++) { for (k = 0, part = particles; k < numparticles; k++, part++) {
// LordHavoc: this is probably no longer necessary, as it is checked at the end, but could still happen on weird particle effects, left for safety...
if (part->die <= cl.time) { if (part->die <= cl.time) {
freeparticles[j++] = part; freeparticles[j++] = part;
continue; continue;
@ -635,9 +636,6 @@ R_DrawParticles (void)
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
part->org[i] += part->vel[i] * host_frametime; part->org[i] += part->vel[i] * host_frametime;
#define alpha_die(p) if (p->alpha < 1) part->die = -1;
switch (part->type) { switch (part->type) {
case pt_static: case pt_static:
break; break;
@ -661,12 +659,10 @@ R_DrawParticles (void)
case pt_smoke: case pt_smoke:
part->scale += host_frametime * 6; part->scale += host_frametime * 6;
part->alpha -= host_frametime * 128; part->alpha -= host_frametime * 128;
alpha_die (part);
break; break;
case pt_smokecloud: case pt_smokecloud:
part->scale += host_frametime * 60; part->scale += host_frametime * 60;
part->alpha -= host_frametime * 128; part->alpha -= host_frametime * 128;
alpha_die (part);
break; break;
case pt_bloodcloud: case pt_bloodcloud:
/* /*
@ -675,26 +671,28 @@ R_DrawParticles (void)
part->scale += host_frametime * 4; part->scale += host_frametime * 4;
part->alpha -= host_frametime * 64; part->alpha -= host_frametime * 64;
part->vel[2] -= grav; part->vel[2] -= grav;
alpha_die (part);
break; break;
case pt_fadespark: case pt_fadespark:
part->alpha -= host_frametime * 256; part->alpha -= host_frametime * 256;
part->vel[2] -= grav; part->vel[2] -= grav;
if (part->alpha < 1)
part->die = -1;
break; break;
case pt_fadespark2: case pt_fadespark2:
part->alpha -= host_frametime * 512; part->alpha -= host_frametime * 512;
part->vel[2] -= grav; part->vel[2] -= grav;
alpha_die (part);
break; break;
case pt_fallfadespark: case pt_fallfadespark:
part->alpha -= host_frametime * 256; part->alpha -= host_frametime * 256;
part->vel[2] -= fast_grav; part->vel[2] -= fast_grav;
if (part->alpha < 1)
part->die = -1;
break; break;
} }
// LordHavoc: most particles already did this, consistency...
if (part->alpha < 1)
part->die = -1;
// LordHavoc: immediate removal of unnecessary particles (must be done to ensure compactor below operates properly in all cases)
if (part->die < cl.time)
freeparticles[j++] = part;
} }
k = 0; k = 0;
while (maxparticle >= activeparticles) { while (maxparticle >= activeparticles) {