From: z411 Date: Wed, 9 Feb 2022 19:43:38 +0000 (-0300) Subject: Add sudden death to timer X-Git-Tag: xonotic-v0.8.5~177^2~21 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1e916ef35319470e220062ca998ae1017d014363;p=xonotic%2Fxonotic-data.pk3dir.git Add sudden death to timer --- diff --git a/qcsrc/client/hud/panel/timer.qc b/qcsrc/client/hud/panel/timer.qc index 1b45095bb..b03165660 100644 --- a/qcsrc/client/hud/panel/timer.qc +++ b/qcsrc/client/hud/panel/timer.qc @@ -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; diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc index 51093d51b..604b4bd5b 100644 --- a/qcsrc/server/world.qc +++ b/qcsrc/server/world.qc @@ -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