From b2737b5c99b7971099ffd2fefb9c8599c69f430b Mon Sep 17 00:00:00 2001 From: Samual Date: Tue, 3 Jan 2012 14:18:26 -0500 Subject: [PATCH] Fixes for sv_fraginfo --- qcsrc/server/g_damage.qc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 170793a55..b192845bc 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -230,25 +230,25 @@ string Obituary_ExtraFragInfo(entity player) // Extra fragmessage information // health/armor of attacker (person who killed you) if(autocvar_sv_fraginfo_stats && (player.health >= 1)) - if((autocvar_sv_fraginfo_stats == 2) || !inWarmupStage) + if((autocvar_sv_fraginfo_stats == 2) || inWarmupStage) health_output = strcat("^7(Health ^1", ftos(rint(player.health)), "^7 / Armor ^2", ftos(rint(player.armorvalue)), "^7)"); // ping display if(autocvar_sv_fraginfo_ping) - ping_output = ((clienttype(player) == CLIENTTYPE_BOT) ? "^2Bot" : strcat("Ping ", ((player.ping >= 150) ? "^1" : "^2"), ftos(player.ping), "ms")); + ping_output = ((clienttype(player) == CLIENTTYPE_BOT) ? "^2Bot" : strcat("Ping ", ((player.ping >= 150) ? "^1" : "^2"), ftos(rint(player.ping)), "ms")); // handicap display if(autocvar_sv_fraginfo_handicap) { if(autocvar_sv_fraginfo_handicap == 2) - handicap_output = strcat(output, strcat("Handicap ^2", ((player.cvar_cl_handicap <= 1) ? "Off" : ftos(player.cvar_cl_handicap)))); + handicap_output = strcat(output, strcat("Handicap ^2", ((player.cvar_cl_handicap <= 1) ? "Off" : ftos(rint(player.cvar_cl_handicap))))); else if(player.cvar_cl_handicap) // with _handicap 1, only show this if there actually is a handicap enabled. - handicap_output = strcat("Handicap ^2", ftos(player.cvar_cl_handicap)); + handicap_output = strcat("Handicap ^2", ftos(rint(player.cvar_cl_handicap))); } // format the string - output = strcat(health_output, (health_output ? " ^7(" : ((ping_output || handicap_output) ? "^7(" : "")), - ping_output, ((ping_output && handicap_output) ? "^7 / " : ""), + output = strcat(health_output, (health_output ? ((ping_output || handicap_output) ? " ^7(" : "") : ((ping_output || handicap_output) ? "^7(" : "")), + ping_output, (handicap_output ? "^7 / " : ""), handicap_output, ((ping_output || handicap_output) ? "^7)" : "")); // add new line to the beginning if there is a message -- 2.39.2