From 67b417c41984ad49d1c13f31832eaa5fa825bd3b Mon Sep 17 00:00:00 2001
From: /dev/humancontroller <devhc@example.com>
Date: Mon, 2 Feb 2015 00:18:01 +0100
Subject: silence a bunch of compiler warnings

---
 src/cgame/cg_buildable.c  | 2 +-
 src/cgame/cg_servercmds.c | 2 +-
 src/cgame/cg_view.c       | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/cgame')

diff --git a/src/cgame/cg_buildable.c b/src/cgame/cg_buildable.c
index 89d23eca..5aae1d20 100644
--- a/src/cgame/cg_buildable.c
+++ b/src/cgame/cg_buildable.c
@@ -122,7 +122,7 @@ static void CG_Creep( centity_t *cent )
     else
       frac = 1.0f;
   }
-  else if( time < 0 )
+  else
   {
     msec = cg.time + time;
     if( msec >= 0 && msec < CREEP_SCALEDOWN_TIME )
diff --git a/src/cgame/cg_servercmds.c b/src/cgame/cg_servercmds.c
index e955e8ab..ae4a2619 100644
--- a/src/cgame/cg_servercmds.c
+++ b/src/cgame/cg_servercmds.c
@@ -1068,7 +1068,7 @@ static void CG_ParseVoice( void )
     return;
 
   vChan = atoi( CG_Argv( 2 ) );
-  if( vChan < 0 || vChan >= VOICE_CHAN_NUM_CHANS )
+  if( (int)vChan < 0 || vChan >= VOICE_CHAN_NUM_CHANS )
     return;
 
   if( cg_teamChatsOnly.integer && vChan != VOICE_CHAN_TEAM )
diff --git a/src/cgame/cg_view.c b/src/cgame/cg_view.c
index 253bc105..f7f42474 100644
--- a/src/cgame/cg_view.c
+++ b/src/cgame/cg_view.c
@@ -925,9 +925,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
-- 
cgit