From 9491d309b0facd8769766e19e53c157de7d23daa Mon Sep 17 00:00:00 2001 From: Samual Date: Mon, 3 Oct 2011 14:36:14 -0400 Subject: [PATCH] Shorten the cvar names (old ones were WAY too long) --- defaultXonotic.cfg | 8 ++++---- qcsrc/server/autocvars.qh | 8 ++++---- qcsrc/server/g_damage.qc | 11 ++++++----- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 883f8efce..0ef845fa4 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -367,10 +367,10 @@ set g_respawn_ghosts_maxtime 6 "maximum amount of time a respawn ghost can last, set sv_gibhealth 100 "Minus health a dead body must have in order to get gibbed" // fragmessage: This allows extra information to be displayed with the frag centerprints. -set sv_fragmessage_information_ping 1 "Enable ping display information, 0 = Never display; 1 = Always display (If the player is a bot, it will say bot instead of the ping.)" -set sv_fragmessage_information_handicap 1 "Enable handicap display information, 0 = Never display; 1 = Only when the player has handicap on; 2 = Always display (Displays Off if off)" -set sv_fragmessage_information_stats 1 "Enable statistics (health/armor) display information, 0 = Never display; 1 = Always display (Only available for the person who was killed)" -set sv_fragmessage_information_typefrag 1 "Enable typefrag display information, 0 = Never display; 1 = Always display" +set sv_fraginfo_ping 1 "Enable ping display information, 0 = Never display; 1 = Always display (If the player is a bot, it will say bot instead of the ping.)" +set sv_fraginfo_handicap 1 "Enable handicap display information, 0 = Never display; 1 = Only when the player has handicap on; 2 = Always display (Displays Off if off)" +set sv_fraginfo_stats 1 "Enable statistics (health/armor) display information, 0 = Never display; 1 = Always display (Only available for the person who was killed)" +set sv_fraginfo_typefrag 1 "Enable typefrag display information, 0 = Never display; 1 = Always display" // use default physics set sv_friction_on_land 0 diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index c91bfa640..3c071f089 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -1105,10 +1105,10 @@ float autocvar_sv_eventlog_files_counter; string autocvar_sv_eventlog_files_nameprefix; string autocvar_sv_eventlog_files_namesuffix; float autocvar_sv_eventlog_files_timestamps; -float autocvar_sv_fragmessage_information_handicap; -float autocvar_sv_fragmessage_information_ping; -float autocvar_sv_fragmessage_information_stats; -float autocvar_sv_fragmessage_information_typefrag; +float autocvar_sv_fraginfo_handicap; +float autocvar_sv_fraginfo_ping; +float autocvar_sv_fraginfo_stats; +float autocvar_sv_fraginfo_typefrag; float autocvar_sv_friction; float autocvar_sv_friction_on_land; float autocvar_sv_gameplayfix_q2airaccelerate; diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index f49df6bae..6258ff9a5 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -229,22 +229,23 @@ string Obituary_ExtraFragInfo(entity player) // Extra fragmessage information string output; // health/armor of attacker (person who killed you) - if(autocvar_sv_fragmessage_information_stats && (player.health >= 1)) + if(autocvar_sv_fraginfo_stats && (player.health >= 1)) health_output = strcat("^7(Health ^1", ftos(rint(player.health)), "^7 / Armor ^2", ftos(rint(player.armorvalue)), "^7)"); // ping display - if(autocvar_sv_fragmessage_information_ping) + if(autocvar_sv_fraginfo_ping) ping_output = ((clienttype(player) == CLIENTTYPE_BOT) ? "^2Bot" : strcat("Ping ", ((player.ping >= 150) ? "^1" : "^2"), ftos(player.ping), "ms")); // handicap display - if(autocvar_sv_fragmessage_information_handicap) + if(autocvar_sv_fraginfo_handicap) { - if(autocvar_sv_fragmessage_information_handicap == 2) + if(autocvar_sv_fraginfo_handicap == 2) handicap_output = strcat(output, strcat("Handicap ^2", ((player.cvar_cl_handicap <= 1) ? "Off" : ftos(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)); } + // format the string output = strcat(health_output, (health_output ? " ^7(" : ((ping_output || handicap_output) ? "^7(" : "")), ping_output, ((ping_output && handicap_output) ? "^7 / " : ""), handicap_output, ((ping_output || handicap_output) ? "^7)" : "")); @@ -401,7 +402,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype) PlayerStats_Event(targ, PLAYERSTATS_ACHIEVEMENT_FIRSTVICTIM, 1); } - if((autocvar_sv_fragmessage_information_typefrag) && (targ.BUTTON_CHAT)) { + if((autocvar_sv_fraginfo_typefrag) && (targ.BUTTON_CHAT)) { Send_CSQC_KillCenterprint(attacker, s, Obituary_ExtraFragInfo(targ), KILL_TYPEFRAG, MSG_KILL); Send_CSQC_KillCenterprint(targ, a, Obituary_ExtraFragInfo(attacker), KILL_TYPEFRAGGED, MSG_KILL); } else { -- 2.39.2