From: Rudolf Polzer <divverent@xonotic.org>
Date: Tue, 29 Jan 2013 08:43:46 +0000 (+0100)
Subject: Merge branch 'master' into divVerent/rank-change
X-Git-Tag: xonotic-v0.7.0~108^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=24312dad229b4f8f5bfb9b2b87452f286361b3f9;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into divVerent/rank-change

Conflicts:
	qcsrc/server/playerstats.qc
---

24312dad229b4f8f5bfb9b2b87452f286361b3f9
diff --cc qcsrc/server/playerstats.qc
index 4702a48e2,e6c69ad49..1213fe83b
--- a/qcsrc/server/playerstats.qc
+++ b/qcsrc/server/playerstats.qc
@@@ -370,14 -370,14 +370,14 @@@ void PlayerStats_AddGlobalInfo(entity p
  void PlayerStats_EndMatch(float finished)
  {
  	entity p;
- 	PlayerScore_Sort(score_dummyfield, 0, 0);
- 	PlayerScore_Sort(scoreboard_pos, 1, 1);
- 	FOR_EACH_CLIENT(p) // spectators intentionally not included
 -	PlayerScore_Sort(score_dummyfield, 0);
 -	PlayerScore_Sort(scoreboard_pos, 1);
++	PlayerScore_Sort(score_dummyfield, 0, 0, 0);
++	PlayerScore_Sort(scoreboard_pos, 1, 1, 1);
+ 	FOR_EACH_CLIENT(p)
  	{
  		//PlayerStats_Accuracy(p); // stats are already written with PlayerStats_AddGlobalInfo(entity), don't double them up.
- 		
- 		if((g_arena || g_lms || g_ca) && (p.alivetime <= 0)) { continue; }
- 		else if(p.classname != "player") { continue; }
+ 
+ 		if(p.frags == FRAGS_SPECTATOR)
+ 			continue;
  
  		if(clienttype(p) == CLIENTTYPE_REAL)
  		{