Simplify vdist macro and remove a redundant vec2 call

diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc
index 82f96d02d55e60dbd89a603a551d2f4002addb9a..39deff0d1c36e202696428237d93589679eb4195 100644 (file)
--- 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 6f419954cc5a333f18b856fc6882586debaa65d3..5863fcf27657b67b7d1cda4add0fc4bca9c31200 100644 (file)
--- 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