From 713bc4a163ab1f0a41dcf375576d64a4e1ed4793 Mon Sep 17 00:00:00 2001 From: Martin Taibr Date: Sun, 11 Dec 2016 17:04:28 +0100 Subject: [PATCH] bound() instead of ifs --- .../mutators/mutator/damagetext/damagetext.qc | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/qcsrc/common/mutators/mutator/damagetext/damagetext.qc b/qcsrc/common/mutators/mutator/damagetext/damagetext.qc index 0ac58c7c3e..3d293d8f8f 100644 --- a/qcsrc/common/mutators/mutator/damagetext/damagetext.qc +++ b/qcsrc/common/mutators/mutator/damagetext/damagetext.qc @@ -126,16 +126,13 @@ CLASS(DamageText, Object) if (this.text) strunzone(this.text); this.text = strzone(s); - if (potential < autocvar_cl_damagetext_size_min_damage) { - this.m_size = autocvar_cl_damagetext_size_min; - } else if (potential > autocvar_cl_damagetext_size_max_damage) { - this.m_size = autocvar_cl_damagetext_size_max; - } else { - float size_range = autocvar_cl_damagetext_size_max - autocvar_cl_damagetext_size_min; - float damage_range = autocvar_cl_damagetext_size_max_damage - autocvar_cl_damagetext_size_min_damage; - float scale_factor = size_range / damage_range; - this.m_size = (potential - autocvar_cl_damagetext_size_min_damage) * scale_factor + autocvar_cl_damagetext_size_min; - } + float size_range = autocvar_cl_damagetext_size_max - autocvar_cl_damagetext_size_min; + float damage_range = autocvar_cl_damagetext_size_max_damage - autocvar_cl_damagetext_size_min_damage; + float scale_factor = size_range / damage_range; + this.m_size = bound( + autocvar_cl_damagetext_size_min, + (potential - autocvar_cl_damagetext_size_min_damage) * scale_factor + autocvar_cl_damagetext_size_min, + autocvar_cl_damagetext_size_max); } CONSTRUCTOR(DamageText, int _group, vector _origin, int _health, int _armor, int _potential_damage, int _deathtype, bool _friendlyfire) { -- 2.39.2