From 57a17f003806d9326b64317babf866d6111c0abb Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Mon, 3 Oct 2005 20:52:19 +0000 Subject: * Removed jump pad code (and associated media loading) * Removed loading of some Q3 cruft * Spilled events attached to temporary entities are now reattached to their original entities, fixing the missing flame bug * Fixed "suicide god" bug * Fixed bug where zap ignores armour * Fixed missing particle systems when follow-spectating * Fixed potential bug involving dodgy pointer arithmetic in CG_LoadClientInfo * Cleaned up logic in CG_AddPlayerWeapon * MASK_SHOT traces no longer collide with corpses * Corpses timeout in 20 seconds instead of 60 * Improved robustness of spawn validation, fixing the bug on transit * A crapload of whitespace fixes --- src/cgame/cg_marks.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/cgame/cg_marks.c') diff --git a/src/cgame/cg_marks.c b/src/cgame/cg_marks.c index deb31c4d..b9c09009 100644 --- a/src/cgame/cg_marks.c +++ b/src/cgame/cg_marks.c @@ -14,7 +14,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ - + #include "cg_local.h" /* @@ -47,7 +47,7 @@ void CG_InitMarkPolys( void ) cg_activeMarkPolys.nextMark = &cg_activeMarkPolys; cg_activeMarkPolys.prevMark = &cg_activeMarkPolys; cg_freeMarkPolys = cg_markPolys; - + for( i = 0; i < MAX_MARK_POLYS - 1; i++ ) cg_markPolys[ i ].nextMark = &cg_markPolys[ i + 1 ]; } @@ -89,7 +89,7 @@ markPoly_t *CG_AllocMark( void ) // no free entities, so free the one at the end of the chain // remove the oldest active entity time = cg_activeMarkPolys.prevMark->time; - + while( cg_activeMarkPolys.prevMark && time == cg_activeMarkPolys.prevMark->time ) CG_FreeMarkPoly( cg_activeMarkPolys.prevMark ); } @@ -123,7 +123,7 @@ passed to the renderer. #define MAX_MARK_FRAGMENTS 128 #define MAX_MARK_POINTS 384 -void CG_ImpactMark( qhandle_t markShader, const vec3_t origin, const vec3_t dir, +void CG_ImpactMark( qhandle_t markShader, const vec3_t origin, const vec3_t dir, float orientation, float red, float green, float blue, float alpha, qboolean alphaFade, float radius, qboolean temporary ) { @@ -216,7 +216,7 @@ void CG_ImpactMark( qhandle_t markShader, const vec3_t origin, const vec3_t dir, mark->color[ 2 ] = blue; mark->color[ 3 ] = alpha; memcpy( mark->verts, verts, mf->numPoints * sizeof( verts[ 0 ] ) ); - markTotal++; + markTotal++; } } -- cgit