]> de.git.xonotic.org Git - voretournament/voretournament.git/commitdiff
Do show 0 minutes when showing remaining time
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 19 Apr 2011 15:46:06 +0000 (18:46 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 19 Apr 2011 15:46:06 +0000 (18:46 +0300)
data/qcsrc/client/sbar.qc

index d856adabb9a7c5b87f803ef18492ed297d71b45a..b6881b45e2eb791d2bc8bc6be538cf0c92b9237e 100644 (file)
@@ -1944,9 +1944,7 @@ void Sbar_Timer()
        } else {\r
                minutes = minutesLeft;\r
                seconds = secondsLeft;\r
-               if (minutes == 0)\r
-                       bgpos_x = topright_x - (46 + 17 + 12) * scale;\r
-               else if (minutes < 10) // nudge the timer background left if more digits are drawn\r
+               if (minutes < 10) // nudge the timer background left if more digits are drawn\r
                        bgpos_x = topright_x - (54 + 17 + 12) * scale;\r
                else if (minutes < 100)\r
                        bgpos_x = topright_x - (62 + 17 + 12) * scale;\r
@@ -1969,9 +1967,7 @@ void Sbar_Timer()
        }\r
 \r
        drawpic(topright - ('19 0 0' + '3 0 0' - '0 2 0'), "gfx/hud/sb_time", '22 22 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
-       if(minutesLeft >= 1 || cvar("sbar_increment_maptime") || timelimit == 0 || warmup_stage) {\r
-               finaltime = strcat(ftos(minutes), ":");\r
-       }\r
+       finaltime = strcat(ftos(minutes), ":");\r
        if(seconds < 10)\r
                finaltime = strcat(finaltime, "0", ftos(seconds));\r
        else\r