Misc cleanups for warmup and welcome message

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud / panel / timer.qc

diff --git a/qcsrc/client/hud/panel/timer.qc b/qcsrc/client/hud/panel/timer.qc
index 68e7312c7a5ba881ee1f45a000e91f64219ea7fb..5209aa07d07662f2996ea5086f14fe712a2aeaf3 100644 (file)
--- a/qcsrc/client/hud/panel/timer.qc
+++ b/qcsrc/client/hud/panel/timer.qc
@@ -73,15 +73,9 @@ void HUD_Timer()
        // Use real or frozen time and get the time limit
        curtime = (intermission_time ? intermission_time : time);
        if(warmup_stage)
-       {
                timelimit = STAT(WARMUP_TIMELIMIT);
-               if(timelimit == 0)
-                       timelimit = STAT(TIMELIMIT) * 60;
-       }
        else
-       {
                timelimit = STAT(TIMELIMIT) * 60;
-       }
 
        // Calculate time left
        timeleft = HUD_Timer_TimeLeft(curtime, STAT(GAMESTARTTIME), timelimit);