X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fwaypointsprites.qc;h=366f6152d02f5c11836b852897242f9ca767e9ea;hb=99e4fa0264127dfcf4675d5f645061b51af815e4;hp=d3d57aba9e8cbcd52ad7606466f912dc394032a9;hpb=cd5790a770717f937f0cf6d5437eaf3a76787e11;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/waypointsprites.qc b/qcsrc/client/waypointsprites.qc
index d3d57aba9..366f6152d 100644
--- a/qcsrc/client/waypointsprites.qc
+++ b/qcsrc/client/waypointsprites.qc
@@ -212,6 +212,8 @@ float spritelookupblinkvalue(string s)
 		case "ons-cp-atck-blue": return 2;
 		case "ons-cp-dfnd-red":  return 0.5;
 		case "ons-cp-dfnd-blue": return 0.5;
+		case "item_health_mega": return 2;
+		case "item_armor_large": return 2;
 		case "item-invis":       return 2;
 		case "item-extralife":   return 2;
 		case "item-speed":       return 2;
@@ -219,6 +221,9 @@ float spritelookupblinkvalue(string s)
 		case "item-shield":      return 2;
 		case "item-fuelregen":   return 2;
 		case "item-jetpack":     return 2;
+		case "wpn-fireball":     return 2; // superweapon
+		case "wpn-minstanex":    return 2; // superweapon
+		case "wpn-porto":        return 2; // superweapon
 		case "tagged-target":    return 2;
 		default:                 return 1;
 	}
@@ -309,13 +314,15 @@ string spritelookuptext(string s)
 		case "dom-blue": return _("Control point");
 		case "dom-yellow": return _("Control point");
 		case "dom-pink": return _("Control point");
+		case "item_health_mega": return _("Mega health");
+		case "item_armor_large": return _("Large armor");
 		case "item-invis": return _("Invisibility");
 		case "item-extralife": return _("Extra life");
 		case "item-speed": return _("Speed");
 		case "item-strength": return _("Strength");
 		case "item-shield": return _("Shield");
-		case "item-fuelregen": return _("Fuel regen");
-		case "item-jetpack": return _("Jet Pack");
+		case "item-fuelregen": return _("Fuel regenerator");
+		case "item-jetpack": return _("Jet pack");
 		case "freezetag_frozen": return _("Frozen!");
 		case "tagged-target": return _("Tagged");
 		case "vehicle": return _("Vehicle");
@@ -411,6 +418,12 @@ void Draw_WaypointSprite()
 	// choose the sprite
 	switch(self.rule)
 	{
+		case SPRITERULE_SPECTATOR:
+			if not(autocvar_g_waypointsprite_itemstime == 1 && t == COLOR_SPECTATOR + 1
+			|| autocvar_g_waypointsprite_itemstime == 2 && (t == COLOR_SPECTATOR + 1 || warmup_stage))
+				return;
+			spriteimage = self.netname;
+			break;
 		case SPRITERULE_DEFAULT:
 			if(self.team)
 			{
@@ -423,7 +436,7 @@ void Draw_WaypointSprite()
 				spriteimage = self.netname;
 			break;
 		case SPRITERULE_TEAMPLAY:
-			if(t == COLOR_SPECTATOR + 1)
+			if(t == NUM_SPECTATOR + 1)
 				spriteimage = self.netname3;
 			else if(self.team == t)
 				spriteimage = self.netname2;
@@ -656,6 +669,7 @@ void Ent_WaypointSprite()
 	self.draw2d = Draw_WaypointSprite;
 
 	InterpolateOrigin_Undo();
+	self.iflags |= IFLAG_ORIGIN;
 
 	if(sendflags & 0x80)
 	{
@@ -688,6 +702,7 @@ void Ent_WaypointSprite()
 		self.origin_x = ReadCoord();
 		self.origin_y = ReadCoord();
 		self.origin_z = ReadCoord();
+		setorigin(self, self.origin);
 	}
 
 	if(sendflags & 1)