fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added full particle effect number range checking. This'll stop crashes with beams not registered in advance.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1165 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2005-07-28 00:42:26 +00:00
parent b43869f191
commit c11e10b693
1 changed files with 72 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
engine/client/r_part.c
View file

@ -1771,7 +1771,7 @@ int P_RunParticleEffectType (vec3_t org, vec3_t dir, float count, int typenum)
beamseg_t *b, *bfirst; beamseg_t *b, *bfirst;
vec3_t ofsvec, arsvec; // offsetspread vec, areaspread vec vec3_t ofsvec, arsvec; // offsetspread vec, areaspread vec
if (typenum < 0) if (typenum < 0 || typenum >= numparticletypes)
return 1; return 1;
if (!ptype->loaded) if (!ptype->loaded)
@ -2301,9 +2301,75 @@ void P_RunParticleEffect4 (vec3_t org, float radius, int color, int effect, int
} }
} }
void P_RunParticleCube(vec3_t minb, vec3_t maxb, vec3_t dir, float count, int colour, qboolean gravity, float jitter)
{
vec3_t org;
int i, j;
vec3_t nvel;
float num;
float invcount;
int ptype = P_FindParticleType(va("te_cube%s_%i", gravity?"_g":"", colour));
if (ptype < 0)
{
ptype = P_FindParticleType(va("te_cube%s", gravity?"_g":""));
if (ptype < 0)
ptype = pe_default;
part_type[ptype].colorindex = colour;
}
invcount = 1/part_type[ptype].count; // using this to get R_RPET to always spawn 1
count = count * part_type[ptype].count;
for (i=0 ; i<count ; i++)
{
if (!free_particles)
return;
for (j=0 ; j<3 ; j++)
{
num = rand() / (float)RAND_MAX;
org[j] = minb[j] + num*(maxb[j]-minb[j]);
}
P_RunParticleEffectType(org, dir, invcount, ptype);
}
}
void P_RunParticleWeather(vec3_t minb, vec3_t maxb, vec3_t dir, float count, int colour, char *efname)
{
vec3_t org;
int i, j;
vec3_t nvel;
float num;
float invcount;
int ptype = P_FindParticleType(va("te_%s_%i", efname, colour));
if (ptype < 0)
{
ptype = P_FindParticleType(va("te_%s", efname));
if (ptype < 0)
ptype = pe_default;
part_type[ptype].colorindex = colour;
}
invcount = 1/part_type[ptype].count; // using this to get R_RPET to always spawn 1
count = count * part_type[ptype].count;
for (i=0 ; i<count ; i++)
{
if (!free_particles)
return;
for (j=0 ; j<3 ; j++)
{
num = rand() / (float)RAND_MAX;
org[j] = minb[j] + num*(maxb[j]-minb[j]);
}
P_RunParticleEffectType(org, dir, invcount, ptype);
}
}
/* /*
=============== ===============
@ -2429,6 +2495,9 @@ int P_ParticleTrail (vec3_t startpos, vec3_t end, int type, trailstate_t **tsk)
float stop; float stop;
float tdegree = 2*M_PI/256; /* MSVC whine */ float tdegree = 2*M_PI/256; /* MSVC whine */
if (typenum < 0 || typenum >= numparticletypes)
return 1; //bad value
if (!ptype->loaded) if (!ptype->loaded)
return 1; return 1;
@ -2786,10 +2855,10 @@ qboolean TraceLineN (vec3_t start, vec3_t end, vec3_t impact, vec3_t normal)
if (pe->model) if (pe->model)
{ {
hull = &pe->model->hulls[0]; hull = &pe->model->hulls[0];
memset (&trace, 0, sizeof(trace));
VectorSubtract(start, pe->origin, ts); VectorSubtract(start, pe->origin, ts);
VectorSubtract(end, pe->origin, te); VectorSubtract(end, pe->origin, te);
if (!pe->model->funcs.Trace(pe->model, 0, 0, ts, te, vec3_origin, vec3_origin, &trace)) pe->model->funcs.Trace(pe->model, 0, 0, ts, te, vec3_origin, vec3_origin, &trace);
if (trace.fraction)
{ {
VectorSubtract(trace.endpos, ts, delta); VectorSubtract(trace.endpos, ts, delta);
len = Length(delta); len = Length(delta);