From 0afaa107a480bf5f53ea2e265552a3610e413372 Mon Sep 17 00:00:00 2001 From: terencehill Date: Wed, 27 May 2020 14:54:50 +0200 Subject: [PATCH] Announce 1 frag remaining when suddendeath mode starts --- qcsrc/server/g_world.qc | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 8d1b58629..d9ca813aa 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -1743,16 +1743,25 @@ float WinningCondition_Scores(float limit, float leadlimit) if(MUTATOR_CALLHOOK(Scores_CountFragsRemaining)) { - float fragsleft = FLOAT_MAX, leadingfragsleft = FLOAT_MAX; - if (limit) - fragsleft = limit - WinningConditionHelper_topscore; - if (leadlimit) - leadingfragsleft = WinningConditionHelper_secondscore + leadlimit - WinningConditionHelper_topscore; - - if (limit && leadlimit && autocvar_leadlimit_and_fraglimit) - fragsleft = max(fragsleft, leadingfragsleft); + float fragsleft; + if (checkrules_suddendeathend && time >= checkrules_suddendeathend) + { + fragsleft = 1; + } else - fragsleft = min(fragsleft, leadingfragsleft); + { + fragsleft = FLOAT_MAX; + float leadingfragsleft = FLOAT_MAX; + if (limit) + fragsleft = limit - WinningConditionHelper_topscore; + if (leadlimit) + leadingfragsleft = WinningConditionHelper_secondscore + leadlimit - WinningConditionHelper_topscore; + + if (limit && leadlimit && autocvar_leadlimit_and_fraglimit) + fragsleft = max(fragsleft, leadingfragsleft); + else + fragsleft = min(fragsleft, leadingfragsleft); + } if (fragsleft_last != fragsleft) // do not announce same remaining frags multiple times { -- 2.39.2