Merge branch 'master' into Mario/arc_bolt_bounce

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / playerstats.qc

diff --git a/qcsrc/common/playerstats.qc b/qcsrc/common/playerstats.qc
index 6760ea0435d905df04b43043a2320ed0379efaa8..2400d4750144916c09109ad4fa1eb55e2a4bdbba 100644 (file)
--- a/qcsrc/common/playerstats.qc
+++ b/qcsrc/common/playerstats.qc
@@ -1,17 +1,18 @@
 #include "playerstats.qh"
+
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "constants.qh"
-    #include "util.qh"
-    #include <common/weapons/_all.qh>
-    #include <server/client.qh>
-    #include "../server/anticheat.qh"
-    #include <common/stats.qh>
-    #include <server/intermission.qh>
-    #include "../server/scores.qh"
+       #include <common/constants.qh>
+       #include <common/stats.qh>
+       #include <common/util.qh>
+       #include <common/weapons/_all.qh>
+       #include <server/anticheat.qh>
+       #include <server/client.qh>
+       #include <server/intermission.qh>
+       #include <server/scores.qh>
+       #include <server/weapons/accuracy.qh>
        #include <server/world.qh>
-    #include "../server/weapons/accuracy.qh"
 #endif
 
 #ifdef SVQC
@@ -136,7 +137,7 @@ void PlayerStats_GameReport_FinalizePlayer(entity p)
        db_put(PS_GR_OUT_DB, sprintf("%s:_playerid", p.playerstats_id), ftos(p.playerid));
 
        if(CS(p).cvar_cl_allow_uid2name == 1 || IS_BOT_CLIENT(p))
-               db_put(PS_GR_OUT_DB, sprintf("%s:_netname", p.playerstats_id), playername(p, false));
+               db_put(PS_GR_OUT_DB, sprintf("%s:_netname", p.playerstats_id), playername(p.netname, p.team, false));
 
        if(teamplay)
                db_put(PS_GR_OUT_DB, sprintf("%s:_team", p.playerstats_id), ftos(p.team));
@@ -166,8 +167,8 @@ void PlayerStats_GameReport(bool finished)
 {
        if(PS_GR_OUT_DB < 0) { return; }
 
-       PlayerScore_Sort(score_dummyfield, 0, 0, 0);
-       PlayerScore_Sort(scoreboard_pos, 1, 1, 1);
+       PlayerScore_Sort(score_dummyfield, 0, false, false);
+       PlayerScore_Sort(scoreboard_pos, 1, true, true);
        if(teamplay) { PlayerScore_TeamStats(); }
 
        FOREACH_CLIENT(true, {