From: Samual Lenks <samual@xonotic.org>
Date: Sun, 13 Jan 2013 18:50:49 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
X-Git-Tag: xonotic-v0.7.0~62^2~23^2~311
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8db035f374df1c19ea24531f8a96f04625f5f559;p=xonotic%2Fxonotic-data.pk3dir.git

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

8db035f374df1c19ea24531f8a96f04625f5f559
diff --cc qcsrc/client/scoreboard.qc
index 152588e53,af982ad46..326d2b36e
--- a/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;
  }