From: TimePath Date: Tue, 26 Jul 2016 12:37:40 +0000 (+1000) Subject: Intrusive list: radar icons X-Git-Tag: xonotic-v0.8.2~700^2~18^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2232a5f180649abaa5da63dab2c299078a1cca19;p=xonotic%2Fxonotic-data.pk3dir.git Intrusive list: radar icons --- diff --git a/qcsrc/client/hud/panel/radar.qc b/qcsrc/client/hud/panel/radar.qc index 3e2a516f9..e935d0cb2 100644 --- 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 ce1b3eb23..e1cbbe79c 100644 --- 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 8ce10947f..4d1ade41d 100644 --- 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;