Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

diff --cc qcsrc/client/scoreboard.qc
index 152588e53e350fefc76ef488d37b9513e7b65ea9,af982ad46547bd4d2435e56f40e7e929b6d38723..326d2b36e0b25d3958232f72ba5b55c352bc0236
--- 1/qcsrc/client/scoreboard.qc
--- 2/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@@ -199,26 -205,30 +205,30 @@@ void HUD_UpdatePlayerPos(entity player
  
  float HUD_CompareTeamScores(entity left, entity right)
  {
-       float vl, vr;
+       float i, r;
  
 -      if(left.team == COLOR_SPECTATOR)
 +      if(left.team == FL_SPECTATOR)
                return 1;
 -      if(right.team == COLOR_SPECTATOR)
 +      if(right.team == FL_SPECTATOR)
                return 0;
  
-       vl = left.teamscores[ts_primary];
-       vr = right.teamscores[ts_primary];
-       if(vl > vr)
-               return IS_INCREASING(teamscores_flags[ts_primary]);
-       if(vl < vr)
-               return IS_DECREASING(teamscores_flags[ts_primary]);
+       r = HUD_CompareScore(left.teamscores[ts_primary], right.teamscores[ts_primary], teamscores_flags[ts_primary]);
+       if (r >= 0)
+               return r;
  
-       vl = left.teamscores[ts_secondary];
-       vr = right.teamscores[ts_secondary];
-       if(vl > vr)
-               return IS_INCREASING(teamscores_flags[ts_secondary]);
-       if(vl < vr)
-               return IS_DECREASING(teamscores_flags[ts_secondary]);
+       r = HUD_CompareScore(left.teamscores[ts_secondary], right.teamscores[ts_secondary], teamscores_flags[ts_secondary]);
+       if (r >= 0)
+               return r;
+ 
+       for(i = 0; i < MAX_SCORE; ++i)
+       {
+               r = HUD_CompareScore(left.teamscores[i], right.teamscores[i], teamscores_flags[i]);
+               if (r >= 0)
+                       return r;
+       }
+ 
+       if (left.team < right.team)
+               return true;
  
        return false;
  }

diff --cc qcsrc/server/race.qc
Simple merge

diff --cc qcsrc/server/scores.qc
Simple merge