From 453a10961794e1a15955e2cfe37ad790a623c66a Mon Sep 17 00:00:00 2001 From: Theriaca Date: Tue, 22 Jan 2019 02:44:29 +0100 Subject: showff: force verbosity when targetting players --- src/game/g_admin.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/game/g_admin.c b/src/game/g_admin.c index cee380e..b7c281d 100644 --- a/src/game/g_admin.c +++ b/src/game/g_admin.c @@ -394,7 +394,7 @@ g_admin_cmd_t g_admin_cmds[ ] = {"showff", G_admin_showff, "showff", "shows how much friendly damage a player has done this game" "\nno arguments will list all connected players", - "([^3name|slot^7] (^5-v|--verbose^7))" + "(^3name|slot^7)" "\n ^3Example:^7 ^120% ^7means 1/5th of the damage dealt this game was dealt to the team" }, @@ -10730,7 +10730,6 @@ qboolean G_admin_showff(gentity_t *ent, int skiparg) { char arg_name_raw[MAX_NAME_LENGTH]; char arg_name[MAX_NAME_LENGTH]; - char arg_opt[MAX_STRING_CHARS]; int target_id, ffpct; gentity_t *target; statsCounters_t *sc; @@ -10760,13 +10759,12 @@ qboolean G_admin_showff(gentity_t *ent, int skiparg) ADMBP(va("%2d %s ^1%3d%% ^7%s^7\n", i, team, ffpct, client->pers.netname)); } - ADMBP("^7for detailed information, use ^3!showff player|slot -v^7\n"); + ADMBP("^7for detailed information, use ^3!showff player|slot^7\n"); ADMBP_end(); return qtrue; } G_SayArgv(1 + skiparg, arg_name_raw, sizeof(arg_name_raw)); - G_SayArgv(2 + skiparg, arg_opt, sizeof(arg_opt)); G_SanitiseString(arg_name_raw, arg_name, sizeof(arg_name)); if (is_numeric(arg_name)) { @@ -10794,16 +10792,11 @@ qboolean G_admin_showff(gentity_t *ent, int skiparg) sc = &target->client->pers.statscounters; ffpct = calc_ff_pct(sc); - if(!strcmp(arg_opt, "-v") || !strcmp(arg_opt, "--verbose")) { - ADMP(va("^3!showff: ^7detailed FF information for %s^7:\n", - target->client->pers.netname)); - ADMP(va("^7damage to: Enemies: ^1%d^7, structures: ^1%d^7, friendlies: ^1%d\n", - sc->dmgdone, sc->structdmgdone, sc->ffdmgdone)); - ADMP(va("dealt ^1%d%%^7 of their total damage to the team\n", ffpct)); - } else { - ADMP(va("^3!showff: %s^7 dealt ^1%d%%^7 of their total damage to the team\n", - target->client->pers.netname, ffpct)); - } + ADMP(va("^3!showff: ^7detailed FF information for %s^7:\n", + target->client->pers.netname)); + ADMP(va("^7damage to: Enemies: ^1%d^7, structures: ^1%d^7, friendlies: ^1%d\n", + sc->dmgdone, sc->structdmgdone, sc->ffdmgdone)); + ADMP(va("dealt ^1%d%%^7 of their total damage to the team\n", ffpct)); return qtrue; } -- cgit