diff options
| author | Tim Angus <tim@ngus.net> | 2009-10-03 12:48:20 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:16:15 +0000 |
| commit | 57d89982f823aaf869d3cbb68cf7715df9c14624 (patch) | |
| tree | c09d9d6bd3687256fa72289f7c700a100b32ba45 /src/cgame/cg_draw.c | |
| parent | 9593f89546da90d2d4d9ed80da767b6a5dd442ef (diff) | |
* Restructure G_WideTrace a bit
* Fix a load of 1.f style floats to 1.0f
Diffstat (limited to 'src/cgame/cg_draw.c')
| -rw-r--r-- | src/cgame/cg_draw.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c index 4c18e4c4..57e6f25f 100644 --- a/src/cgame/cg_draw.c +++ b/src/cgame/cg_draw.c @@ -400,7 +400,7 @@ static void CG_DrawPlayerStaminaBolt( rectDef_t *rect, vec4_t backColor, if( stamina < 0 ) Vector4Copy( backColor, color ); else if( cg.predictedPlayerState.stats[ STAT_STATE ] & SS_SPEEDBOOST ) - Vector4Lerp( ( sin( cg.time / 150.f ) + 1 ) / 2, + Vector4Lerp( ( sin( cg.time / 150.0f ) + 1 ) / 2, backColor, foreColor, color ); else Vector4Copy( foreColor, color ); @@ -814,10 +814,10 @@ static void CG_DrawPlayerHealthCross( rectDef_t *rect, vec4_t ref_color ) // Fade the icon during transition if( cg.lastHealthCross != shader ) { - cg.healthCrossFade += cg.frametime / 500.f; - if( cg.healthCrossFade > 1.f ) + cg.healthCrossFade += cg.frametime / 500.0f; + if( cg.healthCrossFade > 1.0f ) { - cg.healthCrossFade = 0.f; + cg.healthCrossFade = 0.0f; cg.lastHealthCross = shader; } else @@ -826,7 +826,7 @@ static void CG_DrawPlayerHealthCross( rectDef_t *rect, vec4_t ref_color ) color[ 3 ] = ref_alpha * cg.healthCrossFade; trap_R_SetColor( color ); CG_DrawPic( rect->x, rect->y, rect->w, rect->h, shader ); - color[ 3 ] = ref_alpha * ( 1.f - cg.healthCrossFade ); + color[ 3 ] = ref_alpha * ( 1.0f - cg.healthCrossFade ); trap_R_SetColor( color ); CG_DrawPic( rect->x, rect->y, rect->w, rect->h, cg.lastHealthCross ); trap_R_SetColor( NULL ); |