Merge branch 'terencehill/oxygen_bar' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_world.qc

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index d365377c023cd70fead893d46013c59e5cda8d97..aa4c5f505ef64290216e1a5dcbc8af5545abbe25 100644 (file)
--- 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)
+       if(WinningConditionHelper_zeroisworst
+               || (!autocvar_leadlimit_and_fraglimit && limit && leadlimit >= fabs(limit)))
                leadlimit = 0; // not supported in this mode
 
        if(MUTATOR_CALLHOOK(Scores_CountFragsRemaining))
@@ -1770,7 +1771,7 @@ float WinningCondition_Scores(float limit, float leadlimit)
                                        fragsleft |= BIT(3);
                        }
 
-                       fragsleft = fragsleft & -fragsleft; // lowest significant bit
+                       fragsleft = fragsleft & -fragsleft; // least significant bit where 1 is set
 
                        if (fragsleft_last != fragsleft) // do not announce same remaining frags multiple times
                        {