From b3e6878aa21e0746d4e91ea45cedfacc3ad25ca3 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sat, 15 Mar 2025 12:53:04 +0100 Subject: [PATCH] Fix regression causing damagetext to always accumulate if cl_damagetext_accumulate_lifetime is -1 regardless of cl_damagetext_accumulate_alpha_rel This commit changes default damagetext behaviour so that it doesn't accumulate if the alpha of the previous damage text is < 0.65 (after about 1 second), restoring Xonotic 0.8.6 behaviour. This regression was introduced by https://gitlab.com/xonotic/xonotic-data.pk3dir/-/merge_requests/1249 (more precisely commit 2bb671115) and f44a79054f --- qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc | 4 ++-- xonotic-client.cfg | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc b/qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc index 082d24627..d882302ae 100644 --- a/qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc +++ b/qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc @@ -270,9 +270,9 @@ NET_HANDLE(damagetext, bool isNew) // this should only cancel damage accumulation for this DT if (flags & DTFLAG_STOP_ACCUMULATION + || (current_alpha(it) < alphathreshold) || ((autocvar_cl_damagetext_accumulate_lifetime >= 0) // negative never disowns - && (time - it.hit_time > autocvar_cl_damagetext_accumulate_lifetime) - && (current_alpha(it) < alphathreshold))) + && (time - it.hit_time > autocvar_cl_damagetext_accumulate_lifetime))) { it.m_group = 0; } diff --git a/xonotic-client.cfg b/xonotic-client.cfg index 7dd42f8b5..a4ac98942 100644 --- a/xonotic-client.cfg +++ b/xonotic-client.cfg @@ -473,8 +473,8 @@ seta cl_damagetext_velocity_screen "0 0 0" "damage text move direction (screen c seta cl_damagetext_velocity_world "0 0 20" "damage text move direction (world coordinates relative to player's view)" seta cl_damagetext_offset_screen "0 -45 0" "damage text offset (screen coordinates)" seta cl_damagetext_offset_world "0 25 0" "damage text offset (world coordinates relative to player's view)" -seta cl_damagetext_accumulate_alpha_rel "0.65" "only update existing damage text when it's above this much percentage (0 to 1) of the starting alpha" -seta cl_damagetext_accumulate_lifetime "-1" "only update existing damage text when it is younger than this many seconds, negative always updates" +seta cl_damagetext_accumulate_alpha_rel "0.65" "don't update existing damage text when it's below this much percentage (0 to 1) of the starting alpha, set this cvar to \"1\" to ignore this rule" +seta cl_damagetext_accumulate_lifetime "-1" "don't update existing damage text if it is older than this many seconds, set this cvar to \"-1\" to ignore this rule" seta cl_damagetext_friendlyfire "1" "\"0\" = never show for friendly fire, \"1\" = when more than 0 damage, \"2\" = always" seta cl_damagetext_friendlyfire_color "1 0 0" "damage text color for friendlyfire" -- 2.39.5