From: terencehill Date: Thu, 13 Mar 2025 16:56:42 +0000 (+0100) Subject: Fix regression that causes damage text to accumulate if cl_damagetext_accumulate_life... X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=813c33bc4f88b83041fdaf97c1a2f3b267807172;p=xonotic%2Fxonotic-data.pk3dir.git Fix regression that causes damage text to accumulate if cl_damagetext_accumulate_lifetime is >= 0 and if the previous damage text has an alpha lower, instead of greater, than cl_damagetext_accumulate_alpha_rel Regression introduced by f44a79054f "Fix some damagetext accumulation edge cases ..." --- diff --git a/qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc b/qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc index 2bd6fba28..082d24627 100644 --- a/qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc +++ b/qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc @@ -272,7 +272,7 @@ NET_HANDLE(damagetext, bool isNew) if (flags & DTFLAG_STOP_ACCUMULATION || ((autocvar_cl_damagetext_accumulate_lifetime >= 0) // negative never disowns && (time - it.hit_time > autocvar_cl_damagetext_accumulate_lifetime) - && (current_alpha(it) > alphathreshold))) + && (current_alpha(it) < alphathreshold))) { it.m_group = 0; }