Intrusive list: radar icons

diff --git a/qcsrc/client/hud/panel/radar.qc b/qcsrc/client/hud/panel/radar.qc
index 3e2a516f9cd6f2072a0dbbf7e9e252b40a0cb66a..e935d0cb2b27eba1b395593ca192b412afc13c2e 100644 (file)
--- a/qcsrc/client/hud/panel/radar.qc
+++ b/qcsrc/client/hud/panel/radar.qc
@@ -353,7 +353,7 @@ void HUD_Radar()
 
        IL_EACH(g_radarlinks, true, draw_teamradar_link(it.origin, it.velocity, it.team));
 
-       FOREACH_ENTITY_FLAGS(teamradar_icon, 0xFFFFFF, {
+       IL_EACH(g_radaricons, it.teamradar_icon, {
                if ( hud_panel_radar_mouse )
                if ( it.health >= 0 )
                if ( it.team == myteam+1 || gametype == MAPINFO_TYPE_RACE || !(serverflags & SERVERFLAG_TEAMPLAY) )

diff --git a/qcsrc/client/main.qh b/qcsrc/client/main.qh
index ce1b3eb2333419c20a85b2febb5cb4da31a25dc1..e1cbbe79c39673d2fd36c8d65019f4ec8fe9a7e2 100644 (file)
--- a/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@ -96,6 +96,8 @@ vector view_origin, view_forward, view_right, view_up;
 
 IntrusiveList g_radarlinks;
 STATIC_INIT(g_radarlinks) { g_radarlinks = IL_NEW(); }
+IntrusiveList g_radaricons;
+STATIC_INIT(g_radaricons) { g_radaricons = IL_NEW(); }
 
 bool button_zoom;
 bool spectatorbutton_zoom;

diff --git a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
index 8ce10947fe847cbdb29762afe7659ea6f61a6403..4d1ade41d9902d9a1fa5df5ff8a6671ad8a4ab19 100644 (file)
--- a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
+++ b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
@@ -123,7 +123,10 @@ void Ent_WaypointSprite(entity this, bool isnew)
         this.spawntime = time;
 
     this.draw2d = Draw_WaypointSprite;
-    if (isnew) IL_PUSH(g_drawables_2d, this);
+    if (isnew) {
+               IL_PUSH(g_drawables_2d, this);
+               IL_PUSH(g_radaricons, this);
+    }
 
     InterpolateOrigin_Undo(this);
     this.iflags |= IFLAG_ORIGIN;