Replace `vector_[xyz]` with `vector.[xyz]` where possible

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / shownames.qc

diff --git a/qcsrc/client/shownames.qc b/qcsrc/client/shownames.qc
index 8aeb12a046b4ff10b169d70b23ea4eca6e742b28..779898608b816218a21f2350de91fadc384e0235 100644 (file)
--- a/qcsrc/client/shownames.qc
+++ b/qcsrc/client/shownames.qc
@@ -51,10 +51,10 @@ void Draw_ShowNames(entity ent)
                                if(e == ent)
                                        continue;
                                eo = project_3d_to_2d(e.origin);
-                               if (!(eo_z < 0 || eo_x < 0 || eo_y < 0 || eo_x > vid_conwidth || eo_y > vid_conheight))
+                               if (!(eo.z < 0 || eo.x < 0 || eo.y < 0 || eo.x > vid_conwidth || eo.y > vid_conheight))
                                {
                                        eo_z = 0;
-                                       if(vlen((eX * o_x + eY * o_y) - eo) < autocvar_hud_shownames_antioverlap_distance && vlen(ent.origin - view_origin) > vlen(e.origin - view_origin))
+                                       if(vlen((eX * o.x + eY * o.y) - eo) < autocvar_hud_shownames_antioverlap_distance && vlen(ent.origin - view_origin) > vlen(e.origin - view_origin))
                                        {
                                                overlap = TRUE;
                                                break;
@@ -63,8 +63,8 @@ void Draw_ShowNames(entity ent)
                        }
                }
 
-               onscreen = (o_z >= 0 && o_x >= 0 && o_y >= 0 && o_x <= vid_conwidth && o_y <= vid_conheight);
-               crosshairdistance = sqrt( pow(o_x - vid_conwidth/2, 2) + pow(o_y - vid_conheight/2, 2) );
+               onscreen = (o.z >= 0 && o.x >= 0 && o.y >= 0 && o.x <= vid_conwidth && o.y <= vid_conheight);
+               crosshairdistance = sqrt( pow(o.x - vid_conwidth/2, 2) + pow(o.y - vid_conheight/2, 2) );
 
                if(autocvar_hud_shownames_crosshairdistance)
                {
@@ -123,26 +123,26 @@ void Draw_ShowNames(entity ent)
                        resize = 0.5 + 0.5 * ((autocvar_hud_shownames_maxdistance - autocvar_hud_shownames_mindistance) - max(0, dist - autocvar_hud_shownames_mindistance)) / (autocvar_hud_shownames_maxdistance - autocvar_hud_shownames_mindistance);
 
                // draw the sprite image
-               if(o_z >= 0)
+               if(o.z >= 0)
                {
                        o_z = 0;
 
                        vector myPos, mySize;
                        mySize = (eX * autocvar_hud_shownames_aspect + eY) * autocvar_hud_shownames_fontsize;
-                       myPos = o - '0.5 0 0' * mySize_x - '0 1 0' * mySize_y;
+                       myPos = o - '0.5 0 0' * mySize.x - '0 1 0' * mySize.y;
 
                        // size scaling
-                       mySize_x *= resize;
-                       mySize_y *= resize;
+                       mySize.x *= resize;
+                       mySize.y *= resize;
 
-                       myPos_x += 0.5 * (mySize_x / resize - mySize_x);
-                       myPos_y += (mySize_y / resize - mySize_y);
+                       myPos.x += 0.5 * (mySize.x / resize - mySize.x);
+                       myPos.y += (mySize.y / resize - mySize.y);
 
                        vector namepos; // this is where the origin of the string
                        float namewidth;
 
                        namepos = myPos;
-                       namewidth = mySize_x;
+                       namewidth = mySize.x;
 
                        if(autocvar_hud_shownames_status && teamplay)
                        {
@@ -150,10 +150,10 @@ void Draw_ShowNames(entity ent)
                                {
                                        if(ent.healthvalue > 0)
                                        {
-                                               HUD_Panel_DrawProgressBar(namepos + '0 1 0' * autocvar_hud_shownames_fontsize * resize, eX * 0.5 * mySize_x + eY * resize * autocvar_hud_shownames_statusbar_height, "nametag_statusbar", ent.healthvalue/autocvar_hud_panel_healtharmor_maxhealth, 0, 1, '1 0 0', a, DRAWFLAG_NORMAL);
+                                               HUD_Panel_DrawProgressBar(namepos + '0 1 0' * autocvar_hud_shownames_fontsize * resize, eX * 0.5 * mySize.x + eY * resize * autocvar_hud_shownames_statusbar_height, "nametag_statusbar", ent.healthvalue/autocvar_hud_panel_healtharmor_maxhealth, 0, 1, '1 0 0', a, DRAWFLAG_NORMAL);
 
                                                if(ent.armorvalue > 0)
-                                                       HUD_Panel_DrawProgressBar(namepos + '0 1 0' * autocvar_hud_shownames_fontsize * resize + eX * 0.5 * mySize_x, eX * 0.5 * mySize_x + eY * resize * autocvar_hud_shownames_statusbar_height, "nametag_statusbar", ent.armorvalue/autocvar_hud_panel_healtharmor_maxarmor, 0, 0, '0 1 0', a, DRAWFLAG_NORMAL);
+                                                       HUD_Panel_DrawProgressBar(namepos + '0 1 0' * autocvar_hud_shownames_fontsize * resize + eX * 0.5 * mySize.x, eX * 0.5 * mySize.x + eY * resize * autocvar_hud_shownames_statusbar_height, "nametag_statusbar", ent.armorvalue/autocvar_hud_panel_healtharmor_maxarmor, 0, 0, '0 1 0', a, DRAWFLAG_NORMAL);
                                        }
                                }
                        }
@@ -170,7 +170,7 @@ void Draw_ShowNames(entity ent)
                        width = stringwidth(s, TRUE, '1 1 0' * autocvar_hud_shownames_fontsize);
 
                        if (width != namewidth)
-                               namepos_x += (namewidth - width) / 2;
+                               namepos.x += (namewidth - width) / 2;
                        drawcolorcodedstring(namepos, s, '1 1 0' * autocvar_hud_shownames_fontsize, a, DRAWFLAG_NORMAL);
                        drawfontscale = '1 1 0';
                }