summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Schwarz <lakitu7@gmail.com>2009-10-06 07:50:43 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:16:41 +0000
commita6acce827289ae15e8cddff1cafd083099ac28b5 (patch)
tree91cad466193619e29569e873d685f33c890323a3
parent3ae14f6c116571ebceba4af7fcb15a85b5b0c309 (diff)
* (bug 3677) Smoother handling of very short zooms (benmachine)
-rw-r--r--src/cgame/cg_view.c6
1 files 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 );
}
}
}