From fa907e177ebe4d8b7dae96cc2fb6da4e33069ea6 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Tue, 21 Jun 2011 19:44:50 +0200 Subject: [PATCH] Same for WaypointSprite_DeployPersonal() --- qcsrc/server/cl_impulse.qc | 15 +++------------ qcsrc/server/waypointsprites.qc | 5 +++-- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/qcsrc/server/cl_impulse.qc b/qcsrc/server/cl_impulse.qc index 968a5e9ff..c78012bb8 100644 --- a/qcsrc/server/cl_impulse.qc +++ b/qcsrc/server/cl_impulse.qc @@ -135,33 +135,24 @@ void ImpulseCommands (void) switch(imp) { case 30: - wp = WaypointSprite_DeployPersonal("waypoint", self.origin); + wp = WaypointSprite_DeployPersonal("waypoint", self.origin, RADARICON_WAYPOINT, '0 1 1'); if(wp) - { - WaypointSprite_UpdateTeamRadar(wp, RADARICON_WAYPOINT, '0 1 1'); WaypointSprite_Ping(wp); - } sprint(self, "personal waypoint spawned at location\n"); break; case 31: WarpZone_crosshair_trace(self); - wp = WaypointSprite_DeployPersonal("waypoint", trace_endpos); + wp = WaypointSprite_DeployPersonal("waypoint", trace_endpos, RADARICON_WAYPOINT, '0 1 1'); if(wp) - { - WaypointSprite_UpdateTeamRadar(wp, RADARICON_WAYPOINT, '0 1 1'); WaypointSprite_Ping(wp); - } sprint(self, "personal waypoint spawned at crosshair\n"); break; case 32: if(vlen(self.death_origin)) { - wp = WaypointSprite_DeployPersonal("waypoint", self.death_origin); + wp = WaypointSprite_DeployPersonal("waypoint", self.death_origin, RADARICON_WAYPOINT, '0 1 1'); if(wp) - { - WaypointSprite_UpdateTeamRadar(wp, RADARICON_WAYPOINT, '0 1 1'); WaypointSprite_Ping(wp); - } sprint(self, "personal waypoint spawned at death location\n"); } break; diff --git a/qcsrc/server/waypointsprites.qc b/qcsrc/server/waypointsprites.qc index c1e3b0ee6..2b980523e 100644 --- a/qcsrc/server/waypointsprites.qc +++ b/qcsrc/server/waypointsprites.qc @@ -373,10 +373,11 @@ entity WaypointSprite_DeployFixed( .entity waypointsprite_deployed_personal; entity WaypointSprite_DeployPersonal( string spr, - vector ofs + vector ofs, + float icon, vector rgb // initial icon and color ) { - return WaypointSprite_Spawn(spr, 0, 0, world, ofs, world, 0, self, waypointsprite_deployed_personal, FALSE, 0, '0 0 0'); + return WaypointSprite_Spawn(spr, 0, 0, world, ofs, world, 0, self, waypointsprite_deployed_personal, FALSE, icon, rgb); } .entity waypointsprite_attached; -- 2.39.2