summaryrefslogtreecommitdiff
path: root/src/cgame/cg_view.c
diff options
context:
space:
mode:
author/dev/humancontroller <devhc@example.com>2014-07-12 16:07:46 +0200
committerenneract <trem.redman@gmail.com>2014-07-12 17:06:40 +0200
commitfaabf7d64658ae47842b4ccabdb4b68513f3cdf7 (patch)
treec6068758e0e9b7cd504acb93e8830b95215f97d2 /src/cgame/cg_view.c
parent267a7f3eb261f8e9ad63570a2f39e18fc2a91b1c (diff)
fix a bunch of compiler warnings
Diffstat (limited to 'src/cgame/cg_view.c')
-rw-r--r--src/cgame/cg_view.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/cgame/cg_view.c b/src/cgame/cg_view.c
index 97b7582..0feebc8 100644
--- a/src/cgame/cg_view.c
+++ b/src/cgame/cg_view.c
@@ -581,7 +581,7 @@ void CG_OffsetFirstPersonView( void )
// camera shake effect
else if( cg.snap->ps.stats[ STAT_SHAKE ] > 0 )
{
- float fac, mag;
+ float fac;
fac = (float) cg.snap->ps.stats[ STAT_SHAKE ] *
cg_cameraShakeMagnitude.value * 0.15f;
@@ -944,9 +944,7 @@ static int CG_CalcFov( void )
{
f = ( cg.time - cg.zoomTime ) / (float)ZOOM_TIME;
- if ( f > 1.0f )
- fov_y = fov_y;
- else
+ if ( f <= 1.0f )
fov_y = zoomFov + f * ( fov_y - zoomFov );
// BUTTON_ATTACK2 is held so zoom next time