From 078ce4c20d41f3de56ef3631d71b399cb83fde8e Mon Sep 17 00:00:00 2001 From: terencehill Date: Mon, 1 Feb 2021 16:39:55 +0100 Subject: [PATCH] Simplify vdist macro and remove a redundant vec2 call --- qcsrc/client/hud/panel/scoreboard.qc | 2 +- qcsrc/lib/vector.qh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc index 82f96d02d..39deff0d1 100644 --- a/qcsrc/client/hud/panel/scoreboard.qc +++ b/qcsrc/client/hud/panel/scoreboard.qc @@ -880,7 +880,7 @@ void Scoreboard_DrawItem(vector item_pos, vector rgb, entity pl, bool is_self, i vector pos = item_pos; // put a "self indicator" beside the self row, unicode U+25C0 (black left-pointing triangle) if (is_self) - drawstring(pos+eX*(panel_size.x+.5*hud_fontsize.x)+eY, "\xE2\x97\x80", vec2(hud_fontsize.x, hud_fontsize.y), rgb, panel_fg_alpha, DRAWFLAG_NORMAL); + drawstring(pos + eX * (panel_size.x + 0.5 * hud_fontsize.x) + eY, "\xE2\x97\x80", hud_fontsize, rgb, panel_fg_alpha, DRAWFLAG_NORMAL); pos.x += hud_fontsize.x * 0.5; pos.y += (1.25 - 1) / 2 * hud_fontsize.y; // center text vertically diff --git a/qcsrc/lib/vector.qh b/qcsrc/lib/vector.qh index 6f419954c..5863fcf27 100644 --- a/qcsrc/lib/vector.qh +++ b/qcsrc/lib/vector.qh @@ -4,9 +4,8 @@ noref vector _vlen2; #define vlen2(v) (_vlen2 = (v), dotproduct(_vlen2, _vlen2)) #if 1 -noref float _vdist_f; /** Vector distance comparison, avoids sqrt() */ -#define vdist(v, cmp, f) (vlen2(v) cmp (_vdist_f = (f), _vdist_f * _vdist_f)) +#define vdist(v, cmp, f) (vlen2(v) cmp ((f) ** 2)) #else #define vdist(v, cmp, f) (vlen(v) cmp (f)) #endif -- 2.39.2