From b0afe68827796e5e3941714a40c9aeb74f555bac Mon Sep 17 00:00:00 2001 From: Samual Date: Sun, 25 Dec 2011 10:34:10 -0500 Subject: [PATCH] Use divVerent's suggestions -- now works fine --- qcsrc/server/command/common.qc | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/qcsrc/server/command/common.qc b/qcsrc/server/command/common.qc index 717c5c242..43e49219d 100644 --- a/qcsrc/server/command/common.qc +++ b/qcsrc/server/command/common.qc @@ -490,7 +490,8 @@ void CommonCommand_who(float request, entity caller, float argc) entity tmp_player; float privacy = (caller && autocvar_sv_status_privacy); - string separator = strcat((argv(1) ? argv(1) : " "), "^7"); + string separator = strreplace("%", " ", strcat((argv(1) ? argv(1) : " "), "^7")); + string tmp_netaddress, tmp_crypto_idfp; print_to(caller, strcat("List of client information", (privacy ? " (some data is hidden for privacy)" : string_null), ":")); print_to(caller, sprintf(strreplace(" ", separator, " %-4s %-20s %-5s %-3s %-9s %-16s %s "), @@ -500,6 +501,20 @@ void CommonCommand_who(float request, entity caller, float argc) { is_bot = (clienttype(tmp_player) == CLIENTTYPE_BOT); + tmp_netaddress = tmp_player.netaddress; + tmp_crypto_idfp = tmp_player.crypto_idfp; + + if(is_bot) + { + tmp_netaddress = "null/botclient"; + tmp_crypto_idfp = "null/botclient"; + } + else if(privacy) + { + tmp_netaddress = "hidden"; + tmp_crypto_idfp = "hidden"; + } + tmp_hours = tmp_minutes = tmp_seconds = 0; tmp_seconds = floor(time - tmp_player.jointime); @@ -509,14 +524,14 @@ void CommonCommand_who(float request, entity caller, float argc) if(tmp_minutes) { tmp_seconds -= (tmp_minutes * 60); } if(tmp_hours) { tmp_minutes -= (tmp_hours * 60); } - print_to(caller, sprintf(strreplace(" ", separator, " %-4s %-20.20s %-5d %-3d %-9s %-16s %s "), - strcat("#", ftos(num_for_edict(tmp_player))), + print_to(caller, sprintf(strreplace(" ", separator, " #%-3d %-20.20s %-5d %-3d %-9s %-16s %s "), + num_for_edict(tmp_player), tmp_player.netname, tmp_player.ping, tmp_player.ping_packetloss, sprintf("%02d:%02d:%02d", tmp_hours, tmp_minutes, tmp_seconds), - (is_bot ? "null/botclient" : (privacy ? "hidden" : tmp_player.netaddress)), - (is_bot ? "null/botclient" : (privacy ? "hidden" : tmp_player.crypto_idfp)))); + tmp_netaddress, + tmp_crypto_idfp)); ++total_listed_players; } -- 2.39.2