X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fwaypointsprites.qc;h=836a853570bef941b74612a13d03d84e2d774cfc;hb=959ee86ca721e93acf85ada04b0dc5c83882ce3b;hp=5bbf02676f7a16e29a6b1e7dbbd19a0d80bf65d1;hpb=2f2147a6c665f04d1b6e860dce8a8a093e7d2b9e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/waypointsprites.qc b/qcsrc/server/waypointsprites.qc
index 5bbf02676..836a85357 100644
--- a/qcsrc/server/waypointsprites.qc
+++ b/qcsrc/server/waypointsprites.qc
@@ -81,13 +81,28 @@ void WaypointSprite_UpdateTeamRadar(entity e, float icon, vector col)
 	e.SendFlags |= 32;
 }
 
+.float waypointsprite_pingtime;
+.float waypointsprite_helpmetime;
 void WaypointSprite_Ping(entity e)
 {
+	// anti spam
+	if(time < e.waypointsprite_pingtime)
+		return;
+	e.waypointsprite_pingtime = time + 0.3;
 	// ALWAYS sends (this causes a radar circle), thus no check
 	e.cnt |= 0x80;
 	e.SendFlags |= 32;
 }
 
+float waypointsprite_limitedrange, waypointsprite_deployed_lifetime, waypointsprite_deadlifetime;
+
+void WaypointSprite_HelpMePing(entity e)
+{
+	WaypointSprite_Ping(e);
+	e.waypointsprite_helpmetime = time + waypointsprite_deployed_lifetime;
+	e.SendFlags |= 32;
+}
+
 void WaypointSprite_FadeOutIn(entity e, float t)
 {
 	if(!e.fade_time)
@@ -110,7 +125,6 @@ void WaypointSprite_FadeOutIn(entity e, float t)
 	e.SendFlags |= 16;
 }
 
-float waypointsprite_limitedrange, waypointsprite_deployed_lifetime, waypointsprite_deadlifetime;
 void WaypointSprite_Init()
 {
 	waypointsprite_limitedrange = autocvar_g_waypointsprite_limitedrange;
@@ -275,6 +289,13 @@ float WaypointSprite_SendEntity(entity to, float sendflags)
 		WriteByte(MSG_ENTITY, self.colormod_x * 255.0);
 		WriteByte(MSG_ENTITY, self.colormod_y * 255.0);
 		WriteByte(MSG_ENTITY, self.colormod_z * 255.0);
+
+		dt = (self.waypointsprite_helpmetime - time) / 0.1;
+		if(dt < 0)
+			dt = 0;
+		if(dt > 255)
+			dt = 255;
+		WriteByte(MSG_ENTITY, dt);
 	}
 
 	return TRUE;
@@ -294,7 +315,8 @@ entity WaypointSprite_Spawn(
 	entity ref, vector ofs, // position
 	entity showto, float t, // show to whom? Use a flag to indicate a team
 	entity own, .entity ownfield, // remove when own gets killed
-	float hideable // true when it should be controlled by cl_hidewaypoints
+	float hideable, // true when it should be controlled by cl_hidewaypoints
+	float icon, vector rgb // initial icon and color
 )
 {
 	entity wp;
@@ -328,6 +350,8 @@ entity WaypointSprite_Spawn(
 	wp.customizeentityforclient = WaypointSprite_Customize;
 	wp.waypointsprite_visible_for_player = WaypointSprite_visible_for_player;
 	wp.reset2 = WaypointSprite_Reset;
+	wp.cnt = icon;
+	wp.colormod = rgb;
 	Net_LinkEntity(wp, FALSE, 0, WaypointSprite_SendEntity);
 	return wp;
 }
@@ -336,21 +360,23 @@ entity WaypointSprite_SpawnFixed(
 	string spr,
 	vector ofs,
 	entity own,
-	.entity ownfield
+	.entity ownfield,
+	float icon, vector rgb // initial icon and color
 )
 {
-	return WaypointSprite_Spawn(spr, 0, 0, world, ofs, world, 0, own, ownfield, TRUE);
+	return WaypointSprite_Spawn(spr, 0, 0, world, ofs, world, 0, own, ownfield, TRUE, icon, rgb);
 }
 
 .entity waypointsprite_deployed_fixed;
 entity WaypointSprite_DeployFixed(
 	string spr,
 	float limited_range,
-	vector ofs
+	vector ofs,
+	float icon, vector rgb // initial icon and color
 )
 {
 	float t, maxdistance;
-	if(teams_matter)
+	if(teamplay)
 		t = self.team;
 	else
 		t = 0;
@@ -358,29 +384,31 @@ 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);
+	return WaypointSprite_Spawn(spr, waypointsprite_deployed_lifetime, maxdistance, world, ofs, world, t, self, waypointsprite_deployed_fixed, FALSE, icon, rgb);
 }
 
 .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);
+	return WaypointSprite_Spawn(spr, 0, 0, world, ofs, world, 0, self, waypointsprite_deployed_personal, FALSE, icon, rgb);
 }
 
 .entity waypointsprite_attached;
 .entity waypointsprite_attachedforcarrier;
 entity WaypointSprite_Attach(
 	string spr,
-	float limited_range
+	float limited_range,
+	float icon, vector rgb // initial icon and color
 )
 {
 	float t, maxdistance;
 	if(self.waypointsprite_attachedforcarrier)
 		return world; // can't attach to FC
-	if(teams_matter)
+	if(teamplay)
 		t = self.team;
 	else
 		t = 0;
@@ -388,17 +416,18 @@ entity WaypointSprite_Attach(
 		maxdistance = waypointsprite_limitedrange;
 	else
 		maxdistance = 0;
-	return WaypointSprite_Spawn(spr, waypointsprite_deployed_lifetime, maxdistance, self, '0 0 64', world, t, self, waypointsprite_attached, FALSE);
+	return WaypointSprite_Spawn(spr, waypointsprite_deployed_lifetime, maxdistance, self, '0 0 64', world, t, self, waypointsprite_attached, FALSE, icon, rgb);
 }
 
 entity WaypointSprite_AttachCarrier(
 	string spr,
-	entity carrier
+	entity carrier,
+	float icon, vector rgb // initial icon and color
 )
 {
 	entity e;
 	WaypointSprite_Kill(carrier.waypointsprite_attached); // FC overrides attached
-	e = WaypointSprite_Spawn(spr, 0, 0, carrier, '0 0 64', world, carrier.team, carrier, waypointsprite_attachedforcarrier, FALSE);
+	e = WaypointSprite_Spawn(spr, 0, 0, carrier, '0 0 64', world, carrier.team, carrier, waypointsprite_attachedforcarrier, FALSE, icon, rgb);
 	if(e)
 	{
 		WaypointSprite_UpdateMaxHealth(e, '1 0 0' * healtharmor_maxdamage(start_health, start_armorvalue, autocvar_g_balance_armor_blockpercent) * 2);