diff options
| author | Tim Angus <tim@ngus.net> | 2014-06-17 17:43:05 +0100 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2014-06-17 17:43:43 +0100 |
| commit | 77c45fa12305eb8c977c5c7803f6cb1f24ce4ec4 (patch) | |
| tree | ec9324ad73575a42b2eec5050a746b07aa26989d /src/cgame | |
| parent | 1193e49c35fdd0ea24f21c6dff74b5b2cd074c3b (diff) | |
Various adjustments so it compiles
Diffstat (limited to 'src/cgame')
| -rw-r--r-- | src/cgame/cg_draw.c | 4 | ||||
| -rw-r--r-- | src/cgame/cg_ents.c | 2 | ||||
| -rw-r--r-- | src/cgame/cg_particles.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c index 6a3b52a6..9528fed7 100644 --- a/src/cgame/cg_draw.c +++ b/src/cgame/cg_draw.c @@ -2352,9 +2352,9 @@ static void CG_DrawSpeedGraph( rectDef_t *rect, vec4_t foreColor, { val = speedSamples[ ( oldestSpeedSample + i ) % SPEEDOMETER_NUM_SAMPLES ]; if( val < SPEED_MED ) - VectorLerp( val / SPEED_MED, slow, medium, color ); + VectorLerp2( val / SPEED_MED, slow, medium, color ); else if( val < SPEED_FAST ) - VectorLerp( ( val - SPEED_MED ) / ( SPEED_FAST - SPEED_MED ), + VectorLerp2( ( val - SPEED_MED ) / ( SPEED_FAST - SPEED_MED ), medium, fast, color ); else VectorCopy( fast, color ); diff --git a/src/cgame/cg_ents.c b/src/cgame/cg_ents.c index 6c30339b..d4e0f342 100644 --- a/src/cgame/cg_ents.c +++ b/src/cgame/cg_ents.c @@ -964,7 +964,7 @@ static void CG_CalcEntityLerpPositions( centity_t *cent ) // don't let the projectile go through the floor if( tr.fraction < 1.0f ) - VectorLerp( tr.fraction, lastOrigin, cent->lerpOrigin, cent->lerpOrigin ); + VectorLerp2( tr.fraction, lastOrigin, cent->lerpOrigin, cent->lerpOrigin ); } // adjust for riding a mover if it wasn't rolled into the predicted diff --git a/src/cgame/cg_particles.c b/src/cgame/cg_particles.c index a3f74fbd..d3e53f03 100644 --- a/src/cgame/cg_particles.c +++ b/src/cgame/cg_particles.c @@ -1534,7 +1534,7 @@ static qboolean CG_ParseParticleFile( const char *fileName ) } if( i < numBaseParticleSystems ) { - SkipBracedSection( &text_p ); + SkipBracedSection( &text_p, 0 ); continue; } |