From: Rudolf Polzer <divverent@xonotic.org>
Date: Tue, 21 Jun 2011 17:10:30 +0000 (+0200)
Subject: waypointsprites: fix seeker and CTF waypoint display
X-Git-Tag: xonotic-v0.5.0~199^2~12
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=e642aacf20f70575cc04e4a3591e26ec6537fa22;p=xonotic%2Fxonotic-data.pk3dir.git

waypointsprites: fix seeker and CTF waypoint display
---

diff --git a/qcsrc/client/waypointsprites.qc b/qcsrc/client/waypointsprites.qc
index 8ea4ec8d8..3b5deca87 100644
--- 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 507cff85a..e512e70f2 100644
--- 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 f5cbae51b..4aedc6f7b 100644
--- 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 a4f438322..890363da6 100644
--- 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);
 		}
 	}