Merge branch 'master' into terencehill/ft_autorevive_progress

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / scores.qc

diff --git a/qcsrc/server/scores.qc b/qcsrc/server/scores.qc
index 12175bb764f036435c1f745c0ac2ddc12fe74777..73d03ae785783edff94e790774314b69d9c59baf 100644 (file)
--- a/qcsrc/server/scores.qc
+++ b/qcsrc/server/scores.qc
@@ -1,9 +1,10 @@
 #include "scores.qh"
 
 #include "command/common.qh"
-#include "defs.qh"
-#include <server/g_world.qh>
-#include <server/miscfunctions.qh>
+#include <common/weapons/_all.qh>
+#include "client.qh"
+#include <server/intermission.qh>
+#include <server/world.qh>
 #include <server/mutators/_mod.qh>
 #include <server/round_handler.qh>
 #include <common/net_linked.qh>
@@ -861,7 +862,7 @@ void Score_NicePrint_Player(entity to, entity p, float w)
 
        sk = CS(p).scorekeeper;
 
-       s = strcat(s, playername(p, false));
+       s = strcat(s, playername(p.netname, p.team, false));
        for (;;)
        {
                i = strlennocol(s) - NAMEWIDTH;
@@ -893,7 +894,7 @@ void Score_NicePrint_Spectators(entity to)
 
 void Score_NicePrint_Spectator(entity to, entity p)
 {
-       print_to(to, strcat("  ", playername(p, false)));
+       print_to(to, strcat("  ", playername(p.netname, p.team, false)));
 }
 
 .float score_dummyfield;