From: terencehill <piuntn@gmail.com>
Date: Wed, 27 May 2020 12:54:50 +0000 (+0200)
Subject: Announce 1 frag remaining when suddendeath mode starts
X-Git-Tag: xonotic-v0.8.5~1022
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=0afaa107a480bf5f53ea2e265552a3610e413372;p=xonotic%2Fxonotic-data.pk3dir.git

Announce 1 frag remaining when suddendeath mode starts
---

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
 		{