diff options
| author | Andrey Nazarov <skuller@skuller.net> | 2010-09-19 18:52:54 +0400 |
|---|---|---|
| committer | Andrey Nazarov <skuller@skuller.net> | 2010-09-19 20:10:32 +0400 |
| commit | bf4250f35774628a70169b6b0b6d6644a53504bb (patch) | |
| tree | 4f76cb16ca12fe398b98b2c5e63fcc02cc6999f3 | |
| parent | fe038bcdf1fcf2ab2f6975d078c5c82f477836ed (diff) | |
Cleaned up cparticle_t.
| -rw-r--r-- | src/cl_fx.c | 4 | ||||
| -rw-r--r-- | src/cl_local.h | 7 | ||||
| -rw-r--r-- | src/cl_newfx.c | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/cl_fx.c b/src/cl_fx.c index d302256..429718b 100644 --- a/src/cl_fx.c +++ b/src/cl_fx.c @@ -1235,7 +1235,7 @@ CL_FlagTrail =============== */ -void CL_FlagTrail (vec3_t start, vec3_t end, float color) +void CL_FlagTrail (vec3_t start, vec3_t end, int color) { vec3_t move; vec3_t vec; @@ -1630,7 +1630,6 @@ void CL_FlyParticles (vec3_t origin, int count) VectorClear (p->accel); p->color = 0; - p->colorvel = 0; p->alpha = 1; p->alphavel = -100; @@ -1721,7 +1720,6 @@ void CL_BfgParticles (entity_t *ent) VectorSubtract (p->org, ent->origin, v); dist = VectorLength(v) / 90.0; p->color = floor (0xd0 + dist * 7); - p->colorvel = 0; p->alpha = 1.0 - dist; p->alphavel = -100; diff --git a/src/cl_local.h b/src/cl_local.h index 78fe9bb..37ffd22 100644 --- a/src/cl_local.h +++ b/src/cl_local.h @@ -556,8 +556,7 @@ typedef struct cparticle_s { vec3_t org; vec3_t vel; vec3_t accel; - float color; - float colorvel; + int color; // 255 -> use rgb float alpha; float alphavel; color_t rgb; @@ -590,7 +589,7 @@ void CL_BlasterTrail (vec3_t start, vec3_t end); void CL_QuadTrail (vec3_t start, vec3_t end); void CL_OldRailTrail (vec3_t start, vec3_t end); void CL_BubbleTrail (vec3_t start, vec3_t end); -void CL_FlagTrail (vec3_t start, vec3_t end, float color); +void CL_FlagTrail (vec3_t start, vec3_t end, int color); void CL_ParseMuzzleFlash (void); void CL_ParseMuzzleFlash2 (void); void CL_TeleporterParticles (vec3_t org); @@ -632,7 +631,7 @@ void CL_Heatbeam (vec3_t start, vec3_t end); void CL_ParticleSteamEffect (vec3_t org, vec3_t dir, int color, int count, int magnitude); void CL_TrackerTrail (vec3_t start, vec3_t end, int particleColor); void CL_Tracker_Explode(vec3_t origin); -void CL_TagTrail (vec3_t start, vec3_t end, float color); +void CL_TagTrail (vec3_t start, vec3_t end, int color); #if USE_DLIGHTS void CL_ColorFlash (vec3_t pos, int ent, int intensity, float r, float g, float b); #endif diff --git a/src/cl_newfx.c b/src/cl_newfx.c index c227953..eb1eb78 100644 --- a/src/cl_newfx.c +++ b/src/cl_newfx.c @@ -828,7 +828,7 @@ CL_TagTrail =============== */ -void CL_TagTrail (vec3_t start, vec3_t end, float color) +void CL_TagTrail (vec3_t start, vec3_t end, int color) { vec3_t move; vec3_t vec; |