From: Mario <mario@smbclan.net>
Date: Sun, 12 Feb 2017 06:51:45 +0000 (+1000)
Subject: Apply playername function to votes
X-Git-Tag: xonotic-v0.8.2~222
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=daa4a951993bc6ec35296084765e051a3d8277b6;p=xonotic%2Fxonotic-data.pk3dir.git

Apply playername function to votes
---

diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc
index a21feffcb..e331482fc 100644
--- a/qcsrc/server/command/common.qc
+++ b/qcsrc/server/command/common.qc
@@ -24,7 +24,7 @@ string GetCommandPrefix(entity caller)
 // if client return player nickname, or if server return admin nickname
 string GetCallerName(entity caller)
 {
-	if (caller) return caller.netname;
+	if (caller) return playername(caller, false);
 	else return admin_name();  // ((autocvar_sv_adminnick != "") ? autocvar_sv_adminnick : autocvar_hostname);
 }
 
diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc
index 63d78a18f..4a561bf98 100644
--- a/qcsrc/server/command/vote.qc
+++ b/qcsrc/server/command/vote.qc
@@ -109,7 +109,7 @@ void Nagger_ReadyCounted()
 // If the vote_caller is still here, return their name, otherwise vote_caller_name
 string OriginalCallerName()
 {
-	if (IS_REAL_CLIENT(vote_caller)) return vote_caller.netname;
+	if (IS_REAL_CLIENT(vote_caller)) return playername(vote_caller, false);
 	return vote_caller_name;
 }