X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fshownames.qc;h=d4a221cbc8a09c238faa5d44b4b7930fd8c2239a;hb=1d2d6b2b5e13b035f40dbaf4f197f82aceccde52;hp=8a7d225bff7bdc319260e5e0648a2aaff9b7aa08;hpb=7e474d576080259e21690de30778b17029b5c0f2;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc index 8a7d225bf..d4a221cbc 100644 --- a/qcsrc/client/shownames.qc +++ b/qcsrc/client/shownames.qc @@ -2,12 +2,12 @@ #include "autocvars.qh" #include "miscfunctions.qh" +#include "resources.qh" #include "hud/_mod.qh" #include #include #include -#include #include #include @@ -37,8 +37,18 @@ const float SHOWNAMES_FADESPEED = 4; const float SHOWNAMES_FADEDELAY = 0.4; void Draw_ShowNames(entity this) { - if (this.sv_entnum == (current_player + 1)) // self or spectatee - if (!(autocvar_hud_shownames_self && autocvar_chase_active)) return; + if (this.sv_entnum == current_player + 1) // self or spectatee + { + if (!autocvar_chase_active) + return; + + if (!autocvar_hud_shownames_self + && !(spectatee_status > 0 && time <= spectatee_status_changed_time + 1)) + { + return; + } + } + if (!this.sameteam && !autocvar_hud_shownames_enemies) return; bool hit; if (!autocvar_hud_shownames_crosshairdistance && this.sameteam) @@ -77,7 +87,7 @@ void Draw_ShowNames(entity this) if (eo.z < 0 || eo.x < 0 || eo.y < 0 || eo.x > vid_conwidth || eo.y > vid_conheight) continue; eo.z = 0; if (vdist((vec2(o) - eo), <, autocvar_hud_shownames_antioverlap_distance) - && vlen2(it.origin - view_origin) < vlen2(this.origin - view_origin)) + && vlen2(it.origin - view_origin) < vlen2(this.origin - view_origin)) { overlap = 1; break; @@ -86,14 +96,14 @@ void Draw_ShowNames(entity this) } bool onscreen = (o.z >= 0 && o.x >= 0 && o.y >= 0 && o.x <= vid_conwidth && o.y <= vid_conheight); if (!this.fadedelay) this.fadedelay = time + SHOWNAMES_FADEDELAY; - if (this.csqcmodel_isdead) // dead player, fade out slowly + if (this.csqcmodel_isdead) // dead player, fade out slowly { this.alpha = max(0, this.alpha - SHOWNAMES_FADESPEED * 0.25 * frametime); } else if (!onscreen || (!this.sameteam && !hit)) // out of view, fade out { this.alpha = max(0, this.alpha - SHOWNAMES_FADESPEED * frametime); - this.fadedelay = 0; // reset fade in delay, enemy has left the view + this.fadedelay = 0; // reset fade in delay, enemy has left the view } else if (overlap > 0) // tag overlap detected, fade out { @@ -108,16 +118,15 @@ void Draw_ShowNames(entity this) this.alpha = min(1, this.alpha + SHOWNAMES_FADESPEED * frametime); } float a = autocvar_hud_shownames_alpha * this.alpha; - // multiply by player alpha if (!this.sameteam || (this.sv_entnum == player_localentnum)) { float f = entcs_GetAlpha(this.sv_entnum - 1); if (f == 0) f = 1; if (f < 0) f = 0; - // FIXME: alpha is negative when dead, breaking death fade - if (!this.csqcmodel_isdead) a *= f; + a *= f; } - if (a < ALPHA_MIN_VISIBLE && gametype != MAPINFO_TYPE_CTS) return; + if (MUTATOR_CALLHOOK(ShowNames_Draw, this, a)) return; + a = M_ARGV(1, float); if (vdist(this.origin - view_origin, >=, max_shot_distance)) return; float dist = vlen(this.origin - view_origin); if (autocvar_hud_shownames_maxdistance) @@ -145,33 +154,34 @@ void Draw_ShowNames(entity this) myPos.x += 0.5 * (mySize.x / resize - mySize.x); myPos.y += (mySize.y / resize - mySize.y); // this is where the origin of the string - vector namepos = myPos; float namewidth = mySize.x; if (autocvar_hud_shownames_status && this.sameteam) { - vector pos = namepos + eY * autocvar_hud_shownames_fontsize * resize; + vector pos = myPos + eY * autocvar_hud_shownames_fontsize * resize; vector sz = vec2(0.5 * mySize.x, resize * autocvar_hud_shownames_statusbar_height); + if (autocvar_hud_shownames_statusbar_highlight) + drawfill(pos + eX * 0.25 * mySize.x, sz, '0.7 0.7 0.7', a / 2, DRAWFLAG_NORMAL); if (this.healthvalue > 0) { HUD_Panel_DrawProgressBar(pos, sz, "nametag_statusbar", this.healthvalue / autocvar_hud_panel_healtharmor_maxhealth, false, 1, '1 0 0', a, DRAWFLAG_NORMAL); } - if (this.armorvalue > 0) + if (GetResource(this, RES_ARMOR) > 0) { HUD_Panel_DrawProgressBar(pos + eX * 0.5 * mySize.x, sz, "nametag_statusbar", - this.armorvalue / autocvar_hud_panel_healtharmor_maxarmor, false, 0, '0 1 0', a, + GetResource(this, RES_ARMOR) / autocvar_hud_panel_healtharmor_maxarmor, false, 0, '0 1 0', a, DRAWFLAG_NORMAL); } } string s = entcs_GetName(this.sv_entnum - 1); - if ((autocvar_hud_shownames_decolorize == 1 && teamplay) - || autocvar_hud_shownames_decolorize == 2) s = playername(s, entcs_GetTeam(this.sv_entnum - 1)); + if ((autocvar_hud_shownames_decolorize == 1 && teamplay) || autocvar_hud_shownames_decolorize == 2) + s = playername(s, entcs_GetTeam(this.sv_entnum - 1)); drawfontscale = '1 1 0' * resize; s = textShortenToWidth(s, namewidth, '1 1 0' * autocvar_hud_shownames_fontsize, stringwidth_colors); float width = stringwidth(s, true, '1 1 0' * autocvar_hud_shownames_fontsize); - if (width != namewidth) namepos.x += (namewidth - width) / 2; - drawcolorcodedstring(namepos, s, '1 1 0' * autocvar_hud_shownames_fontsize, a, DRAWFLAG_NORMAL); + myPos.x = o.x - (width * resize) / 2; + drawcolorcodedstring(myPos, s, '1 1 0' * autocvar_hud_shownames_fontsize, a, DRAWFLAG_NORMAL); drawfontscale = '1 1 0'; } } @@ -193,17 +203,18 @@ void Draw_ShowNames_All() if (entcs.m_entcs_private) { it.healthvalue = entcs.healthvalue; - it.armorvalue = entcs.armorvalue; + SetResourceExplicit(it, RES_ARMOR, GetResource(entcs, RES_ARMOR)); it.sameteam = true; } else { it.healthvalue = 0; - it.armorvalue = 0; + SetResourceExplicit(it, RES_ARMOR, 0); it.sameteam = false; } bool dead = entcs_IsDead(i) || entcs_IsSpectating(i); - if (!it.csqcmodel_isdead) setorigin(it, entcs.origin); + if ((!it.csqcmodel_isdead || it.alpha > 0) && entcs.origin != it.origin) + setorigin(it, entcs.origin); it.csqcmodel_isdead = dead; Draw_ShowNames(it); });