]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Add sudden death to timer
authorz411 <z411@omaera.org>
Wed, 9 Feb 2022 19:43:38 +0000 (16:43 -0300)
committerz411 <z411@omaera.org>
Wed, 9 Feb 2022 19:43:38 +0000 (16:43 -0300)
qcsrc/client/hud/panel/timer.qc
qcsrc/server/world.qc

index 1b45095bb534d2847e053811bdbd2399b6440158..b0316566057909dcaf7fbedab11df598100eeb7e 100644 (file)
@@ -94,17 +94,17 @@ void HUD_Timer()
 
        // Subtext
        overtimes = STAT(OVERTIMESADDED);
-       
+
        if(warmup_stage || autocvar__hud_configure)
                subtext = _("Warmup");
        else if(intermission_time)
                subtext = _("Intermission");
        else if(STAT(TIMEOUT_STATUS))
                subtext = _("Timeout");
-       else if(overtimes == 1)
-               subtext = _("Overtime");
-       else if (overtimes > 1)
+       else if (overtimes >= 2)
                subtext = sprintf(_("Overtime #%d"), overtimes);
+       else if(overtimes)
+               subtext = _("Overtime");
        else
                subtext = string_null;
 
index 51093d51b512abb12fc687c7b391ee0fea9b28db..604b4bd5be32c5002f1a179a9ef729f3917741ed 100644 (file)
@@ -1636,6 +1636,7 @@ void CheckRules_World()
                                Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_RACE_FINISHLAP);
                        else
                                Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_OVERTIME_FRAG);
+                       checkrules_overtimesadded = 1;
                }
        }
        else