Don't announce frags remaining if leadlimit_and_fraglimit 1 and fraglimit 0 and leadl...

Basically I've just added 'if (limit)' before 'fragsleft = max(leadingfragsleft, fragsleft);', other changes are just code rearrangement.
Also removed 'if (fragsleft > 3) fragsleft = 0;' as it was just an negligible optimization

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 89fee905142073f9dcb6d0aeaa91f8b8ef484e15..fd8631f31a8657e82d664149f6ba16c83b729b7d 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -1751,28 +1751,24 @@ float WinningCondition_Scores(float limit, float leadlimit)
                        leaderscore = WinningConditionHelper_topscore;
                        secondscore = WinningConditionHelper_secondscore;
 
+                       if (limit)
+                               fragsleft = limit - leaderscore;
                        if (leadlimit)
                                leadingfragsleft = secondscore + leadlimit - leaderscore;
-                       if (autocvar_leadlimit_and_fraglimit && leadlimit && limit)
+
+                       if (autocvar_leadlimit_and_fraglimit && leadlimit)
                        {
-                               fragsleft = limit - leaderscore;
-                               fragsleft = max(leadingfragsleft, fragsleft);
+                               if (limit)
+                                       fragsleft = max(leadingfragsleft, fragsleft);
                        }
-                       else
+                       else if (leadlimit)
                        {
                                if (limit)
-                               {
-                                       fragsleft = limit - leaderscore;
-                                       if (leadlimit)
-                                               fragsleft = min(fragsleft, leadingfragsleft);
-                               }
-                               else if (leadlimit)
+                                       fragsleft = min(fragsleft, leadingfragsleft);
+                               else
                                        fragsleft = leadingfragsleft;
                        }
 
-                       if (fragsleft > 3)
-                               fragsleft = 0;
-
                        if (fragsleft_last != fragsleft) // do not announce same remaining frags multiple times
                        {
                                if (fragsleft == 1)