Merge branch 'master' into mirceakitsune/hud_postprocessing

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / View.qc

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 13051f4ef2b0cfb02de488322b87a90700179ace..8a862f5d77fbab730f58f25cb56a47500eb48e1a 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -493,7 +493,10 @@ void CSQC_UpdateView(float w, float h)
        TargetMusic_Advance();
        Fog_Force();
 
-       drawframetime = max(0.000001, time - drawtime);
+       if(drawtime == 0)
+               drawframetime = 0.01666667; // when we don't know fps yet, we assume 60fps
+       else
+               drawframetime = bound(0.000001, time - drawtime, 1);
        drawtime = time;
 
        // watch for gametype changes here...