diff options
| author | Michael Levin <risujin@fastmail.fm> | 2009-10-03 11:13:10 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:14:46 +0000 |
| commit | d9d4a8c3cb1fb226738278923cf8d5ba2b74efdf (patch) | |
| tree | 23637261238f8791a95e33eef077079608de4030 /src/cgame/cg_draw.c | |
| parent | ae1fb9aecf949fb7261b3e4b065a4bddd016de6b (diff) | |
Added armour files to version control.
Diffstat (limited to 'src/cgame/cg_draw.c')
| -rw-r--r-- | src/cgame/cg_draw.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c index 47e7d477..c8f75da0 100644 --- a/src/cgame/cg_draw.c +++ b/src/cgame/cg_draw.c @@ -593,14 +593,15 @@ CG_DrawPlayerBoosterBolt static void CG_DrawPlayerBoosterBolt( rectDef_t *rect, vec4_t color, qhandle_t shader ) { vec4_t localColor; + playerState_t *ps = &cg.snap->ps; Vector4Copy( color, localColor ); - if( cg.boostedTime >= 0 ) + if( ps->stats[ STAT_STATE ] & SS_BOOSTED ) { - if( ( cg.time - cg.boostedTime ) > BOOST_TIME - 3000 ) + if( ps->stats[ STAT_MISC2 ] < 3000 ) { - qboolean flash = ( cg.time / 500 ) % 2; + qboolean flash = ( ps->stats[ STAT_MISC2 ] / 500 ) % 2; if( flash ) localColor[ 3 ] = 1.0f; @@ -1986,7 +1987,7 @@ static void CG_DrawCrosshair( void ) wi = &cg_weapons[ cg.snap->ps.weapon ]; - w = h = wi->crossHairSize; + w = h = wi->crossHairSize * cg_crosshairSize.value; w *= cgDC.aspectScale; @@ -3017,5 +3018,3 @@ void CG_DrawActive( stereoFrame_t stereoView ) CG_Draw2D( ); } - - |