X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fteamradar.qc;h=c565651d4a3a0b49daee81ae6a76649b60889d66;hb=31f0ca0b52c23fc560a592a4ebafdf85c8890419;hp=c5f1c2fb4b1468b1b50bf997f366987ce675c83f;hpb=26d2cece1d88a2fad9e0a2f8069c3924496698c1;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc index c5f1c2fb4..c565651d4 100644 --- a/qcsrc/client/teamradar.qc +++ b/qcsrc/client/teamradar.qc @@ -93,18 +93,19 @@ void draw_teamradar_player(vector coord3d, vector pangles, vector rgb) coord = teamradar_texcoord_to_2dcoord(teamradar_3dcoord_to_texcoord(coord3d)); - makevectors(pangles - '0 1 0' * teamradar_angle); + vector forward, right, up; + MAKE_VECTORS(pangles - '0 1 0' * teamradar_angle, forward, right, up); if(v_flipped) { - v_forward.x = -v_forward.x; - v_right.x = -v_right.x; - v_up.x = -v_up.x; + forward.x = -forward.x; + right.x = -right.x; + up.x = -up.x; // TODO: unused! } - v_forward.z = 0; - v_forward = normalize(v_forward); - v_forward.y *= -1.0; - v_right.x = -v_forward.y; - v_right.y = v_forward.x; + forward.z = 0; + forward = normalize(forward); + forward.y *= -1.0; + right.x = -forward.y; + right.y = forward.x; if(rgb == '1 1 1') rgb2 = '0 0 0'; @@ -112,17 +113,17 @@ void draw_teamradar_player(vector coord3d, vector pangles, vector rgb) rgb2 = '1 1 1'; R_BeginPolygon("", 0); - R_PolygonVertex(coord+v_forward*3, '0 0 0', rgb2, panel_fg_alpha); - R_PolygonVertex(coord+v_right*4-v_forward*2.5, '0 1 0', rgb2, panel_fg_alpha); - R_PolygonVertex(coord-v_forward*2, '1 0 0', rgb2, panel_fg_alpha); - R_PolygonVertex(coord-v_right*4-v_forward*2.5, '1 1 0', rgb2, panel_fg_alpha); + R_PolygonVertex(coord+forward*3, '0 0 0', rgb2, panel_fg_alpha); + R_PolygonVertex(coord+right*4-forward*2.5, '0 1 0', rgb2, panel_fg_alpha); + R_PolygonVertex(coord-forward*2, '1 0 0', rgb2, panel_fg_alpha); + R_PolygonVertex(coord-right*4-forward*2.5, '1 1 0', rgb2, panel_fg_alpha); R_EndPolygon(); R_BeginPolygon("", 0); - R_PolygonVertex(coord+v_forward*2, '0 0 0', rgb, panel_fg_alpha); - R_PolygonVertex(coord+v_right*3-v_forward*2, '0 1 0', rgb, panel_fg_alpha); - R_PolygonVertex(coord-v_forward, '1 0 0', rgb, panel_fg_alpha); - R_PolygonVertex(coord-v_right*3-v_forward*2, '1 1 0', rgb, panel_fg_alpha); + R_PolygonVertex(coord+forward*2, '0 0 0', rgb, panel_fg_alpha); + R_PolygonVertex(coord+right*3-forward*2, '0 1 0', rgb, panel_fg_alpha); + R_PolygonVertex(coord-forward, '1 0 0', rgb, panel_fg_alpha); + R_PolygonVertex(coord-right*3-forward*2, '1 1 0', rgb, panel_fg_alpha); R_EndPolygon(); } @@ -149,7 +150,7 @@ void draw_teamradar_icon(vector coord, entity icon, entity pingdata, vector rgb, void draw_teamradar_link(vector start, vector end, int colors) { - TC(int, colors); + TC(int, colors); vector c0, c1, norm; start = teamradar_texcoord_to_2dcoord(teamradar_3dcoord_to_texcoord(start));