team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removed Auto: Changed resolution 

particles/beams should clear correctly on r_part


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@721 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2005-01-04 19:19:51 +00:00
parent 2768319718
commit eede8928f3
2 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
engine/client/r_part.c
View File

@ -225,8 +225,13 @@ part_type_t *GetParticleType(char *name)
ptype->assoc=-1;
ptype->cliptype = -1;
ptype->emit = -1;
/*
Due to BZ_Realloc we can assume all of this anyway
ptype->loaded = 0;
ptype->ramp = NULL;
ptype->particles = NULL;
ptype->beams = NULL;
*/
return ptype;
}
@ -300,7 +305,7 @@ void R_ParticleEffect_f(void)
char *var, *value;
char *buf;
particle_t *parts;
beamseg_t *beamsegs;
beamseg_t *beamsegs, *btemp;
skytris_t *st;
part_type_t *ptype;
@ -333,13 +338,47 @@ void R_ParticleEffect_f(void)
pnum = ptype-part_type;
parts = ptype->particles;
beamsegs = ptype->beams;
st = ptype->skytris;
if (ptype->ramp)
BZ_Free(ptype->ramp);
while (ptype->particles) // empty particle list
{
parts = ptype->particles->next;
ptype->particles->next = free_particles;
free_particles = ptype->particles;
ptype->particles = parts;
}
// clear beam list.. bit more complex
while (ptype->beams && !(ptype->beams->flags & BS_LASTSEG))
{
beamsegs = ptype->beams->next;
ptype->beams->next = free_beams;
free_beams = ptype->beams;
ptype->beams = beamsegs;
}
btemp = ptype->beams;
while (btemp)
{
if (btemp->flags & BS_LASTSEG) // prevent runaway pointers
{
btemp->flags |= BS_DEAD;
btemp = btemp->next;
}
else
{
beamsegs = btemp->next;
btemp->next = free_beams;
free_beams = btemp;
btemp = beamsegs;
}
}
beamsegs = ptype->beams;
memset(ptype, 0, sizeof(*ptype));
ptype->particles = parts;
// ptype->particles = parts;
ptype->beams = beamsegs;
ptype->skytris = st;
strcpy(ptype->name, Cmd_Argv(1));

3
engine/client/renderer.c
View File

@ -1620,9 +1620,6 @@ TRACE(("dbg: R_ApplyRenderer: efrags\n"));
else
UI_Reset();
if (cls.state)
Cbuf_AddText("say Auto: Changed resolution\n", RESTRICT_MAX);
switch (qrenderer)
{
case QR_NONE: