From a6acce827289ae15e8cddff1cafd083099ac28b5 Mon Sep 17 00:00:00 2001
From: Christopher Schwarz <lakitu7@gmail.com>
Date: Tue, 6 Oct 2009 07:50:43 +0000
Subject: * (bug 3677) Smoother handling of very short zooms (benmachine)

---
 src/cgame/cg_view.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/cgame/cg_view.c b/src/cgame/cg_view.c
index 0f6b7751..85d5bea9 100644
--- a/src/cgame/cg_view.c
+++ b/src/cgame/cg_view.c
@@ -943,7 +943,8 @@ static int CG_CalcFov( void )
         if( !( cmd.buttons & BUTTON_ATTACK2 ) )
         {
           cg.zoomed   = qfalse;
-          cg.zoomTime = cg.time;
+          cg.zoomTime = MIN( cg.time, 
+              cg.time + cg.time - cg.zoomTime - ZOOM_TIME );
         }
       }
       else
@@ -959,7 +960,8 @@ static int CG_CalcFov( void )
         if( cmd.buttons & BUTTON_ATTACK2 )
         {
           cg.zoomed   = qtrue;
-          cg.zoomTime = cg.time;
+          cg.zoomTime = MIN( cg.time, 
+              cg.time + cg.time - cg.zoomTime - ZOOM_TIME );
         }
       }
     }
-- 
cgit