Simplified timer upper bound

diff --git a/qcsrc/client/hud/panel/timer.qc b/qcsrc/client/hud/panel/timer.qc
index 08ff9e7360c46d61812e2d5f4ad8e6d3a3dff94d..a9512a42fd73be39fbc9f613d09d26c84f3fc698 100644 (file)
--- a/qcsrc/client/hud/panel/timer.qc
+++ b/qcsrc/client/hud/panel/timer.qc
@@ -46,6 +46,7 @@ void HUD_Timer()
        timeout_last = STAT(TIMEOUT_LAST);
 
        timeleft = max(0, timelimit * 60 + STAT(GAMESTARTTIME) - time);
+       timeleft = min(timeleft, timelimit * 60);
        timeleft = ceil(timeleft);
 
        // countdown sound
@@ -109,12 +110,7 @@ void HUD_Timer()
                        else
                                timer = warmup_timeleft;
                } else {
-                       if (time < STAT(GAMESTARTTIME))
-                               timer = floor(timelimit * 60);
-                       //else if (overtimes > 0)
-                       //      timer = floor(time - STAT(OVERTIMESTARTTIME));
-                       else
-                               timer = timeleft;
+                       timer = timeleft;
                }
        }