X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Fdamagetext%2Fcl_damagetext.qc;h=5f8d8e68230623cb7fad6700b059895c72b5ff49;hp=bafe8c460733dae6c492706f8a8b6eb0fb405567;hb=bc50c2d7ca3e0a44ed1712400ef8e170e6df8210;hpb=bf31f77bddd7e794f2ba2525dec999a40169bc99 diff --git a/qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc b/qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc index bafe8c460..5f8d8e682 100644 --- a/qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc +++ b/qcsrc/common/mutators/mutator/damagetext/cl_damagetext.qc @@ -155,8 +155,7 @@ CLASS(DamageText, Object) ); } - if (this.text) strunzone(this.text); - this.text = strzone(s); + strcpy(this.text, s); this.m_size = map_bound_ranges(potential, autocvar_cl_damagetext_size_min_damage, autocvar_cl_damagetext_size_max_damage, @@ -180,7 +179,7 @@ CLASS(DamageText, Object) } DESTRUCTOR(DamageText) { - if (this.text) strunzone(this.text); + strfree(this.text); if (this == DamageText_screen_first) { // start from 0 offset again, hopefully, others (if any) will have faded away by now DamageText_screen_first = NULL; @@ -233,9 +232,7 @@ NET_HANDLE(damagetext, bool isNew) } make_impure(NEW(DamageText, server_entity_index, entcs.origin, false, health, armor, potential_damage, deathtype, friendlyfire)); } else if (autocvar_cl_damagetext_2d && spectatee_status != -1) { - // never show 2d damagetext when observing - // on some maps (hearth_v2, The_Yard), sometimes has_origin is false even though observers should know about all players - // it happens mostly with bots but occasionally also with players + // never show 2d damagetext when observing - might be a bug in .has_origin // screen coords only vector screen_pos = vec2(vid_conwidth * autocvar_cl_damagetext_2d_pos.x, vid_conheight * autocvar_cl_damagetext_2d_pos.y);