Merge branch 'master' into martin-t/globals

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / teamradar.qh

diff --git a/qcsrc/client/teamradar.qh b/qcsrc/client/teamradar.qh
index 78ef5ee714e93f17c41841e8716368c1bc370179..41c7d46c564465924e272e585f249db640639b23 100644 (file)
--- a/qcsrc/client/teamradar.qh
+++ b/qcsrc/client/teamradar.qh
@@ -1,14 +1,13 @@
-#ifndef TEAMRADAR_H
-#define TEAMRADAR_H
+#pragma once
 
 const int MAX_TEAMRADAR_TIMES = 32;
 
 entityclass(TeamRadar);
 // to make entities have dots on the team radar
-class(TeamRadar) .float teamradar_icon;
-class(TeamRadar) .float teamradar_times[MAX_TEAMRADAR_TIMES];
-class(TeamRadar) .int teamradar_time_index;
-class(TeamRadar) .vector teamradar_color;
+classfield(TeamRadar) .float teamradar_icon;
+classfield(TeamRadar) .float teamradar_times[MAX_TEAMRADAR_TIMES];
+classfield(TeamRadar) .int teamradar_time_index;
+classfield(TeamRadar) .vector teamradar_color;
 
 float teamradar_angle; // player yaw angle
 vector teamradar_origin3d_in_texcoord; // player origin
@@ -33,9 +32,7 @@ vector teamradar_3dcoord_to_texcoord(vector in);
 
 vector teamradar_texcoord_to_2dcoord(vector in);
 
-vector teamradar_texcoord_to_3dcoord(vector in,float z);
-
-vector yinvert(vector v);
+vector teamradar_texcoord_to_3dcoord(vector in,float oz);
 
 void draw_teamradar_background(float fg);
 
@@ -46,9 +43,3 @@ void draw_teamradar_icon(vector coord, entity icon, entity pingdata, vector rgb,
 void draw_teamradar_link(vector start, vector end, int colors);
 
 void teamradar_loadcvars();
-
-// radar links
-
-void Ent_RadarLink();
-
-#endif