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 7aa469818b621ef287583e0ac78c0fa4f78962fc..aa4c5f505ef64290216e1a5dcbc8af5545abbe25 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -1707,7 +1707,7 @@ void ShuffleMaplist()
 
 float leaderscore;
 float secondscore;
-int fragsleftlast;
+int fragsleft_last;
 float WinningCondition_Scores(float limit, float leadlimit)
 {
        float limitreached;
@@ -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,9 +1771,9 @@ 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 (fragsleftlast != fragsleft) // do not announce same remaining frags multiple times
+                       if (fragsleft_last != fragsleft) // do not announce same remaining frags multiple times
                        {
                                if (fragsleft & BIT(1))
                                        Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_REMAINING_FRAG_1);
@@ -1781,7 +1782,7 @@ float WinningCondition_Scores(float limit, float leadlimit)
                                else if (fragsleft & BIT(3))
                                        Send_Notification(NOTIF_ALL, NULL, MSG_ANNCE, ANNCE_REMAINING_FRAG_3);
 
-                               fragsleftlast = fragsleft;
+                               fragsleft_last = fragsleft;
                        }
                }
        }