From: Rudolf Polzer <divverent@xonotic.org>
Date: Tue, 21 Jun 2011 17:23:37 +0000 (+0200)
Subject: also add the extra args to WaypointSprite_DeployFixed
X-Git-Tag: xonotic-v0.5.0~199^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ffe74df10db813f42dcc00e11fd568960d2bd849;p=xonotic%2Fxonotic-data.pk3dir.git

also add the extra args to WaypointSprite_DeployFixed
---

diff --git a/qcsrc/server/cl_impulse.qc b/qcsrc/server/cl_impulse.qc
index 8ce1cec13..968a5e9ff 100644
--- a/qcsrc/server/cl_impulse.qc
+++ b/qcsrc/server/cl_impulse.qc
@@ -179,64 +179,46 @@ void ImpulseCommands (void)
 				}
 				break;
 			case 34:
-				wp = WaypointSprite_DeployFixed("here", FALSE, self.origin);
+				wp = WaypointSprite_DeployFixed("here", FALSE, self.origin, RADARICON_HERE, '0 1 0');
 				if(wp)
-				{
-					WaypointSprite_UpdateTeamRadar(wp, RADARICON_HERE, '0 1 0');
 					WaypointSprite_Ping(wp);
-				}
 				sprint(self, "HERE spawned at location\n");
 				break;
 			case 35:
 				WarpZone_crosshair_trace(self);
-				wp = WaypointSprite_DeployFixed("here", FALSE, trace_endpos);
+				wp = WaypointSprite_DeployFixed("here", FALSE, trace_endpos, RADARICON_HERE, '0 1 0');
 				if(wp)
-				{
-					WaypointSprite_UpdateTeamRadar(wp, RADARICON_HERE, '0 1 0');
 					WaypointSprite_Ping(wp);
-				}
 				sprint(self, "HERE spawned at crosshair\n");
 				break;
 			case 36:
 				if(vlen(self.death_origin))
 				{
-					wp = WaypointSprite_DeployFixed("here", FALSE, self.death_origin);
+					wp = WaypointSprite_DeployFixed("here", FALSE, self.death_origin, RADARICON_HERE, '0 1 0');
 					if(wp)
-					{
-						WaypointSprite_UpdateTeamRadar(wp, RADARICON_HERE, '0 1 0');
 						WaypointSprite_Ping(wp);
-					}
 					sprint(self, "HERE spawned at death location\n");
 				}
 				break;
 			case 37:
-				wp = WaypointSprite_DeployFixed("danger", FALSE, self.origin);
+				wp = WaypointSprite_DeployFixed("danger", FALSE, self.origin, RADARICON_DANGER, '1 0.5 0');
 				if(wp)
-				{
-					WaypointSprite_UpdateTeamRadar(wp, RADARICON_DANGER, '1 0.5 0');
 					WaypointSprite_Ping(wp);
-				}
 				sprint(self, "DANGER spawned at location\n");
 				break;
 			case 38:
 				WarpZone_crosshair_trace(self);
-				wp = WaypointSprite_DeployFixed("danger", FALSE, trace_endpos);
+				wp = WaypointSprite_DeployFixed("danger", FALSE, trace_endpos, RADARICON_DANGER, '1 0.5 0');
 				if(wp)
-				{
-					WaypointSprite_UpdateTeamRadar(wp, RADARICON_DANGER, '1 0.5 0');
 					WaypointSprite_Ping(wp);
-				}
 				sprint(self, "DANGER spawned at crosshair\n");
 				break;
 			case 39:
 				if(vlen(self.death_origin))
 				{
-					wp = WaypointSprite_DeployFixed("danger", FALSE, self.death_origin);
+					wp = WaypointSprite_DeployFixed("danger", FALSE, self.death_origin, RADARICON_DANGER, '1 0.5 0');
 					if(wp)
-					{
-						WaypointSprite_UpdateTeamRadar(wp, RADARICON_DANGER, '1 0.5 0');
 						WaypointSprite_Ping(wp);
-					}
 					sprint(self, "DANGER spawned at death location\n");
 				}
 				break;
diff --git a/qcsrc/server/waypointsprites.qc b/qcsrc/server/waypointsprites.qc
index e794c29d3..c1e3b0ee6 100644
--- a/qcsrc/server/waypointsprites.qc
+++ b/qcsrc/server/waypointsprites.qc
@@ -354,7 +354,8 @@ entity WaypointSprite_SpawnFixed(
 entity WaypointSprite_DeployFixed(
 	string spr,
 	float limited_range,
-	vector ofs
+	vector ofs,
+	float icon, vector rgb // initial icon and color
 )
 {
 	float t, maxdistance;
@@ -366,7 +367,7 @@ entity WaypointSprite_DeployFixed(
 		maxdistance = waypointsprite_limitedrange;
 	else
 		maxdistance = 0;
-	return WaypointSprite_Spawn(spr, waypointsprite_deployed_lifetime, maxdistance, world, ofs, world, t, self, waypointsprite_deployed_fixed, FALSE, RADARICON_NONE, '0 0 0');
+	return WaypointSprite_Spawn(spr, waypointsprite_deployed_lifetime, maxdistance, world, ofs, world, t, self, waypointsprite_deployed_fixed, FALSE, icon, rgb);
 }
 
 .entity waypointsprite_deployed_personal;