]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Apply playername function to votes
authorMario <mario@smbclan.net>
Sun, 12 Feb 2017 06:51:45 +0000 (16:51 +1000)
committerMario <mario@smbclan.net>
Sun, 12 Feb 2017 06:51:45 +0000 (16:51 +1000)
qcsrc/server/command/common.qc
qcsrc/server/command/vote.qc

index a21feffcb2a976ef491dac7cdf00fdccbb9da21a..e331482fc1a351e7bd4ad2f9cbec417b5462ae3e 100644 (file)
@@ -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);
 }
 
index 63d78a18f2a634229057ea7d27d1396ddf8ce6c2..4a561bf98409c88a2309a1bac87b7fb6eeb5849e 100644 (file)
@@ -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;
 }