waypointsprites: fix seeker and CTF waypoint display

diff --git a/qcsrc/client/waypointsprites.qc b/qcsrc/client/waypointsprites.qc
index 8ea4ec8d82b51cddfb398e1870b60d33d0f71422..3b5deca87134d8a4438e54a33fd76938a0bd0d05 100644 (file)
--- a/qcsrc/client/waypointsprites.qc
+++ b/qcsrc/client/waypointsprites.qc
@@ -213,6 +213,7 @@ float spritelookupblinkvalue(string s)
                case "item-shueld":      return 2;
                case "item-fuelregen":   return 2;
                case "item-jetpack":     return 2;
+               case "tagged-target":    return 2;
                default:                 return 1;
        }
 }
@@ -429,7 +430,7 @@ void Draw_WaypointSprite()
        if(rgb == '0 0 0')
        {
                self.teamradar_color = '1 0 1';
-               print(sprintf("WARNING: sprite of name %s has no color, using pink so you notice it\n")); 
+               print(sprintf("WARNING: sprite of name %s has no color, using pink so you notice it\n", spriteimage)); 
        }
 
        if(time - floor(time) > 0.5)

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index 507cff85abcdb2780ee6af7054a6500d5f9f18d6..e512e70f2803ed9b72d97936b624f7b0ecda289c 100644 (file)
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -133,6 +133,7 @@ const float RADARICON_GENERATOR = 1;
 const float RADARICON_OBJECTIVE = 1;
 const float RADARICON_DOMPOINT = 1;
 const float RADARICON_POWERUP = 1;
+const float RADARICON_TAGGED = 1;
 
 ///////////////////////////
 // key constants

diff --git a/qcsrc/server/ctf.qc b/qcsrc/server/ctf.qc
index f5cbae51b505e157ba501b5cd1820d667454bd12..4aedc6f7b3904ba02125ffc371eec503e2f06b3b 100644 (file)
--- a/qcsrc/server/ctf.qc
+++ b/qcsrc/server/ctf.qc
@@ -297,10 +297,11 @@ void DropFlag(entity e, entity penalty_receiver, entity attacker)
        e.playerid = attacker.playerid;
        e.ctf_droptime = time;
        WaypointSprite_Spawn("flagdropped", 0, 0, e, '0 0 1' * 61, world, COLOR_TEAM1 + COLOR_TEAM2 - e.team, e, waypointsprite_attachedforcarrier, FALSE);
+       WaypointSprite_UpdateTeamRadar(e.waypointsprite_attachedforcarrier, RADARICON_FLAG, '0 1 1');
+       WaypointSprite_Ping(e.waypointsprite_attachedforcarrier);
        
        if(p.waypointsprite_attachedforcarrier)
        {
-               WaypointSprite_Ping(p.waypointsprite_attachedforcarrier);
                WaypointSprite_DetachCarrier(p);
        }
        else

diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc
index a4f4383227506ecc0c0d7bb0100fd39c70c7a506..890363da61747e3c8f1de9eb68f297489430bae5 100644 (file)
--- a/qcsrc/server/w_seeker.qc
+++ b/qcsrc/server/w_seeker.qc
@@ -455,6 +455,7 @@ void Seeker_Tag_Touch()
                if      (autocvar_g_balance_seeker_type == 1)
                {
                        WaypointSprite_Spawn("tagged-target", autocvar_g_balance_seeker_tag_tracker_lifetime, 0, other, '0 0 64', self.owner, 0, other, wps_tag_tracker, TRUE);
+                       WaypointSprite_UpdateTeamRadar(other.wps_tag_tracker, RADARICON_TAGGED, '0.5 1 0');
                        WaypointSprite_UpdateRule(other.wps_tag_tracker, 0, SPRITERULE_DEFAULT);
                }
        }