From 90725afe2084011cd7b9320f67c4b18ee217c8f6 Mon Sep 17 00:00:00 2001 From: TimeServ Date: Mon, 30 May 2005 11:05:44 +0000 Subject: [PATCH] minor trailstate fixes git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1064 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/r_part.c | 9 ++++----- engine/common/particles.h | 3 +++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/engine/client/r_part.c b/engine/client/r_part.c index 5915af0a..022e0514 100644 --- a/engine/client/r_part.c +++ b/engine/client/r_part.c @@ -2315,7 +2315,7 @@ void CLQ2_RailTrail (vec3_t start, vec3_t end) } // Trailstate functions -void P_CleanTrailstate(trailstate_t *ts) +static void P_CleanTrailstate(trailstate_t *ts) { // clear LASTSEG flag from lastbeam so it can be reused if (ts->lastbeam) @@ -2336,7 +2336,8 @@ void P_DelinkTrailstate(trailstate_t **tsk) if (*tsk == NULL) return; // not linked to a trailstate - ts = *tsk; + ts = *tsk; // store old pointer + *tsk = NULL; // clear pointer if (ts->key != tsk) return; // prevent overwrite @@ -2351,11 +2352,9 @@ void P_DelinkTrailstate(trailstate_t **tsk) P_CleanTrailstate(assoc); assoc = ts; } - - *tsk = NULL; // erase pointer } -trailstate_t *P_NewTrailstate(trailstate_t **key) +static trailstate_t *P_NewTrailstate(trailstate_t **key) { trailstate_t *ts; diff --git a/engine/common/particles.h b/engine/common/particles.h index bd0ec844..c12c114e 100644 --- a/engine/common/particles.h +++ b/engine/common/particles.h @@ -172,4 +172,7 @@ int P_RunParticleEffectTypeString (vec3_t org, vec3_t dir, float count, char *na void P_EmitSkyEffectTris(struct model_s *mod, struct msurface_s *fa); +// trailstate functions +void P_DelinkTrailstate(trailstate_t **tsk); + #endif