qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-30 16:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

externs in .c files are evil, evil evil (ok, so I haven't cleaned these ones

Browse source 
out yet:P). This fixes the recent GL crash.
This commit is contained in:
Bill Currie 2001-10-27 22:27:32 +00:00
parent 3601b5ba35
commit 10d83e090a
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libs/video/renderer/gl/gl_dyn_part.c
View file

@ -59,7 +59,7 @@ static const char rcsid[] =
int ramp[8] = { 0x6f, 0x6d, 0x6b, 0x69, 0x67, 0x65, 0x63, 0x61 }; int ramp[8] = { 0x6f, 0x6d, 0x6b, 0x69, 0x67, 0x65, 0x63, 0x61 };
extern int part_tex_dot, part_tex_smoke, part_tex_spark; extern int part_tex_dot, part_tex_smoke, part_tex_spark;
extern unsigned int r_maxparticles, numparticles; extern short r_maxparticles, numparticles;
extern particle_t *particles, **freeparticles; extern particle_t *particles, **freeparticles;
@ -86,6 +86,9 @@ particle_new (ptype_t type, int texnum, vec3_t org, float scale, vec3_t vel,
part->alpha = alpha; part->alpha = alpha;
part->tex = texnum; part->tex = texnum;
part->scale = scale; part->scale = scale;
if (numparticles > r_maxparticles)
Sys_Error ("%s: numparticles > r_maxparticles: %d, %d\n", __func__,
numparticles, r_maxparticles);
return part; return part;
} }
@ -355,6 +358,9 @@ R_RunSpikeEffect (vec3_t org, particle_effect_t type)
default: default:
break; break;
} }
if (numparticles > r_maxparticles)
Sys_Error ("%s: numparticles > r_maxparticles: %d, %d\n", __func__,
numparticles, r_maxparticles);
} }
void void
@ -716,6 +722,9 @@ R_DrawParticles (void)
if (!r_particles->int_val) if (!r_particles->int_val)
return; return;
if (numparticles > r_maxparticles)
Sys_Error ("%s:%d: numparticles > r_maxparticles: %d, %d\n", __func__,
__LINE__, numparticles, r_maxparticles);
// LordHavoc: particles should not affect zbuffer // LordHavoc: particles should not affect zbuffer
qfglDepthMask (GL_FALSE); qfglDepthMask (GL_FALSE);
@ -835,6 +844,9 @@ R_DrawParticles (void)
} }
} }
k = 0; k = 0;
if (numparticles > r_maxparticles)
Sys_Error ("%s:%d: numparticles > r_maxparticles: %d, %d\n", __func__,
__LINE__, numparticles, r_maxparticles);
while (maxparticle >= activeparticles) { while (maxparticle >= activeparticles) {
*freeparticles[k++] = particles[maxparticle--]; *freeparticles[k++] = particles[maxparticle--];
while (maxparticle >= activeparticles && while (maxparticle >= activeparticles &&
@ -845,4 +857,7 @@ R_DrawParticles (void)
qfglColor3ubv (color_white); qfglColor3ubv (color_white);
qfglDepthMask (GL_TRUE); qfglDepthMask (GL_TRUE);
if (numparticles > r_maxparticles)
Sys_Error ("%s:%d: numparticles > r_maxparticles: %d, %d\n", __func__,
__LINE__, numparticles, r_maxparticles);
} }