From: terencehill <piuntn@gmail.com>
Date: Sat, 21 Mar 2020 22:16:30 +0000 (+0100)
Subject: Fix previous commit breaking leadlimit_and_fraglimit 1
X-Git-Tag: xonotic-v0.8.5~1133^2~13
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c7069d140f07f801814a58b3d4e0368c27a497fd;p=xonotic%2Fxonotic-data.pk3dir.git

Fix previous commit breaking leadlimit_and_fraglimit 1
---

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 49f8257f9..aa4c5f505 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -1737,7 +1737,8 @@ float WinningCondition_Scores(float limit, float leadlimit)
 		limit = -limit;
 	}
 
-	if(WinningConditionHelper_zeroisworst || (limit && leadlimit >= fabs(limit)))
+	if(WinningConditionHelper_zeroisworst
+		|| (!autocvar_leadlimit_and_fraglimit && limit && leadlimit >= fabs(limit)))
 		leadlimit = 0; // not supported in this mode
 
 	if(MUTATOR_CALLHOOK(Scores_CountFragsRemaining))