From: Martin Taibr Date: Wed, 22 Feb 2017 08:47:29 +0000 (+0100) Subject: the conditions are identical, make them look identical X-Git-Tag: xonotic-v0.8.2~169^2~3 X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=99e5a9ce0489a8dd473fc4d26c011239d3327cab;p=xonotic%2Fxonotic-data.pk3dir.git the conditions are identical, make them look identical --- diff --git a/qcsrc/common/mutators/mutator/damagetext/damagetext.qc b/qcsrc/common/mutators/mutator/damagetext/damagetext.qc index f89b6caeb..04d57e2b5 100644 --- a/qcsrc/common/mutators/mutator/damagetext/damagetext.qc +++ b/qcsrc/common/mutators/mutator/damagetext/damagetext.qc @@ -114,7 +114,7 @@ CLASS(DamageText, Object) : sprintf("%d", potential) ), s); s = strreplace("{potential_health}", ( - (this.m_potential_damage - this.m_armordamage == this.m_healthdamage && autocvar_cl_damagetext_format_hide_redundant) + (this.m_potential_damage == this.m_healthdamage + this.m_armordamage && autocvar_cl_damagetext_format_hide_redundant) ? "" : sprintf("%d", potential_health) ), s);