From: Martin Taibr Date: Thu, 17 Nov 2016 18:26:00 +0000 (+0100) Subject: cvar in cfg X-Git-Tag: xonotic-v0.8.2~169^2~13 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=931f6f0d60a741748c7ca27104c40132ba22e957;p=xonotic%2Fxonotic-data.pk3dir.git cvar in cfg --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 7322bd42d..5ca7f4e54 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -786,6 +786,7 @@ seta g_waypointsprite_tactical 1 "tactical overlay on turrets when in a vehicle" seta cl_damagetext "1" "Draw damage dealt where you hit the enemy" seta cl_damagetext_format "-{total}" "How to format the damage text. {health}, {armor}, {total}, {potential}: full damage not capped to target's health, {potential_health}: health damage not capped to target's health" seta cl_damagetext_format_verbose 0 "{health} shows {potential_health} too when they differ; {total} shows {potential} too when they differ" +seta cl_damagetext_format_hide_redundant 0 "hide {armor} if 0; hide {potential} and {potential_health} when same as actual" seta cl_damagetext_color "1 1 0" "Damage text color" seta cl_damagetext_color_per_weapon "0" "Damage text uses weapon color" seta cl_damagetext_size "8" "Damage text font size" diff --git a/qcsrc/common/mutators/mutator/damagetext/damagetext.qc b/qcsrc/common/mutators/mutator/damagetext/damagetext.qc index 7514882e3..9cd5bdf30 100644 --- a/qcsrc/common/mutators/mutator/damagetext/damagetext.qc +++ b/qcsrc/common/mutators/mutator/damagetext/damagetext.qc @@ -17,7 +17,7 @@ REGISTER_MUTATOR(damagetext, true); AUTOCVAR_SAVE(cl_damagetext, bool, true, "Draw damage dealt where you hit the enemy"); AUTOCVAR_SAVE(cl_damagetext_format, string, "-{total}", "How to format the damage text. {health}, {armor}, {total}, {potential}: full damage not capped to target's health, {potential_health}: health damage not capped to target's health"); AUTOCVAR_SAVE(cl_damagetext_format_verbose, bool, false, "{health} shows {potential_health} too when they differ; {total} shows {potential} too when they differ"); -AUTOCVAR_SAVE(cl_damagetext_format_hide_redundant, bool, false, "hide {armor} if 0 and potential when same as actual"); // TODO cfg +AUTOCVAR_SAVE(cl_damagetext_format_hide_redundant, bool, false, "hide {armor} if 0; hide {potential} and {potential_health} when same as actual"); STATIC_INIT(DamageText_LegacyFormat) { if (strstrofs(autocvar_cl_damagetext_format, "{", 0) < 0) autocvar_cl_damagetext_format = "-{total}"; }