X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fteamradar.qc;h=abd700e613e38895b44ceeba7acbe86498895b42;hp=01388fdd2ff7ad69609cc6f00ea671df7df98724;hb=a394baa72a77a2db64709e44caa89a6fb4aaf5f4;hpb=f72821fdcebe3ca01181a99727a06198de65ea08 diff --git a/qcsrc/client/teamradar.qc b/qcsrc/client/teamradar.qc index 01388fdd2..abd700e61 100644 --- a/qcsrc/client/teamradar.qc +++ b/qcsrc/client/teamradar.qc @@ -1,6 +1,6 @@ #include "teamradar.qh" -#include "hud/all.qh" +#include "hud/_mod.qh" #include @@ -49,12 +49,12 @@ vector teamradar_2dcoord_to_texcoord(vector in) return out; } -vector teamradar_texcoord_to_3dcoord(vector in,float z) +vector teamradar_texcoord_to_3dcoord(vector in,float oz) { vector out; out_x = in_x * (mi_picmax_x - mi_picmin_x) + mi_picmin_x; out_y = in_y * (mi_picmax_y - mi_picmin_y) + mi_picmin_y; - out_z = z; + out_z = oz; return out; } @@ -128,7 +128,7 @@ void draw_teamradar_player(vector coord3d, vector pangles, vector rgb) void draw_teamradar_icon(vector coord, entity icon, entity pingdata, vector rgb, float a) { coord = teamradar_texcoord_to_2dcoord(teamradar_3dcoord_to_texcoord(coord)); - drawpic(coord - '4 4 0', strcat("gfx/teamradar_icon_", ftos(icon.m_radaricon)), '8 8 0', rgb, a, 0); + drawpic_builtin(coord - '4 4 0', strcat("gfx/teamradar_icon_", ftos(icon.m_radaricon)), '8 8 0', rgb, a, 0); if(pingdata) { @@ -141,7 +141,7 @@ void draw_teamradar_icon(vector coord, entity icon, entity pingdata, vector rgb, if(dt >= 1 || dt <= 0) continue; vector v = '2 2 0' * teamradar_size * dt; - drawpic(coord - 0.5 * v, "gfx/teamradar_ping", v, '1 1 1', (1 - dt) * a, DRAWFLAG_ADDITIVE); + drawpic_builtin(coord - 0.5 * v, "gfx/teamradar_ping", v, '1 1 1', (1 - dt) * a, DRAWFLAG_ADDITIVE); } } } @@ -203,6 +203,7 @@ NET_HANDLE(ENT_CLIENT_RADARLINK, bool isnew) this.iflags = IFLAG_VELOCITY | IFLAG_ORIGIN; this.classname = "radarlink"; + if (isnew) IL_PUSH(g_radarlinks, this); if(sendflags & 1) {