From: Samual Date: Fri, 6 Jan 2012 21:47:51 +0000 (-0500) Subject: Global cvar for all sv_fraginfo stuff, plus make the entire thing support between... X-Git-Tag: xonotic-v0.6.0~188^2~16^2~9 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=13863e5a92e3cb8947e92a2ac1129df426051e40;p=xonotic%2Fxonotic-data.pk3dir.git Global cvar for all sv_fraginfo stuff, plus make the entire thing support between warmup and normal mode --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 75950a9cd..d99e9bede 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -328,10 +328,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_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" +set sv_fraginfo 1 "Enable extra frag message information, 0 = Never display, 1 = Display only in warmup mode; 2 = 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 disabled)" +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)" // use default physics set sv_friction_on_land 0 diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh index a57590204..6f5ea2b29 100644 --- a/qcsrc/server/autocvars.qh +++ b/qcsrc/server/autocvars.qh @@ -1104,10 +1104,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_fraginfo; 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 dde853283..bd4426c3a 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -228,32 +228,34 @@ string Obituary_ExtraFragInfo(entity player) // Extra fragmessage information string handicap_output; string output; - // 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 && ((autocvar_sv_fraginfo == 2) || inWarmupStage)) + { + // health/armor of attacker (person who killed you) + 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_fraginfo_ping) - 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(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(rint(player.cvar_cl_handicap))); + // ping display + if(autocvar_sv_fraginfo_ping) + 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(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(rint(player.cvar_cl_handicap))); + } + + // format the string + 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 + if(output) { output = strcat("\n", output); } } - // format the string - 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 - if(output) { output = strcat("\n", output); } - return output; } @@ -403,7 +405,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype) PlayerStats_Event(targ, PLAYERSTATS_ACHIEVEMENT_FIRSTVICTIM, 1); } - if((autocvar_sv_fraginfo_typefrag) && (targ.BUTTON_CHAT)) { + if(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 {