delete from list instead of maintaining state

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2374 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2006-08-20 00:47:13 +00:00
parent 06a892ef76
commit 72b679e209
1 changed files with 17 additions and 5 deletions

View File

@ -428,7 +428,7 @@ void P_ParticleEffect_f(void)
qboolean setbeamlen = false; qboolean setbeamlen = false;
part_type_t *ptype, *torun; part_type_t *ptype, *torun;
int pnum, assoc, state; int pnum, assoc;
if (Cmd_Argc()!=2) if (Cmd_Argc()!=2)
{ {
@ -479,8 +479,22 @@ void P_ParticleEffect_f(void)
} }
beamsegs = ptype->beams; beamsegs = ptype->beams;
state = ptype->state;
torun = ptype->nexttorun; // if we're in the runstate loop through and remove from linked list
if (ptype->state & PS_INRUNLIST)
{
if (part_run_list == ptype)
part_run_list = part_run_list->nexttorun;
else
{
for (torun = part_run_list; torun != NULL; torun = torun->nexttorun)
{
if (torun->nexttorun == ptype)
torun->nexttorun = torun->nexttorun->nexttorun;
}
}
}
memset(ptype, 0, sizeof(*ptype)); memset(ptype, 0, sizeof(*ptype));
// ptype->particles = parts; // ptype->particles = parts;
ptype->beams = beamsegs; ptype->beams = beamsegs;
@ -497,8 +511,6 @@ void P_ParticleEffect_f(void)
ptype->rotationstartmin = -M_PI; //start with a random angle ptype->rotationstartmin = -M_PI; //start with a random angle
ptype->rotationstartrand = M_PI-ptype->rotationstartmin; ptype->rotationstartrand = M_PI-ptype->rotationstartmin;
ptype->spawnchance = 1; ptype->spawnchance = 1;
ptype->nexttorun = torun;
ptype->state = state; // should this really be maintained?
while(1) while(1)
{ {