X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fwaypointsprites.qc;h=7ee34672c5caa087b242ef27aad7b8d3e64f8363;hb=59ee6e0f35a47970a544835449e58ff7073d6382;hp=68ecfd74b022f2dc77f04afdad869c02cd1f644d;hpb=fca9d306878750e9523e97225c36a4237559b729;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/waypointsprites.qc b/qcsrc/client/waypointsprites.qc
index 68ecfd74b..7ee34672c 100644
--- a/qcsrc/client/waypointsprites.qc
+++ b/qcsrc/client/waypointsprites.qc
@@ -217,20 +217,31 @@ float spritelookupblinkvalue(string s)
 }
 vector spritelookupcolor(string s, vector def)
 {
-	if(substring(s, 0, 4) == "wpn-")
-		return (get_weaponinfo(stof(substring(s, 4, strlen(s)))).wpcolor);
-
 	switch(s)
 	{
 		case "keycarrier-friend": return '0 1 0';
+		case "wpn-laser":         return '1 0.5 0.5';
+		case "wpn-shotgun":       return '0.5 0.25 0';
+		case "wpn-uzi":           return '1 1 0';
+		case "wpn-gl":            return '1 0 0';
+		case "wpn-electro":       return '0 0.5 1';
+		case "wpn-crylink":       return '1 0.5 1';
+		case "wpn-nex":           return '0.5 1 1';
+		case "wpn-hagar":         return '1 1 0.5';
+		case "wpn-rl":            return '1 1 0';
+		case "wpn-porto":         return '0.5 0.5 0.5';
+		case "wpn-minstanex":     return '0.5 1 1';
+		case "wpn-hookgun":       return '0 0.5 0';
+		case "wpn-fireball":      return '1 0.5 0';
+		case "wpn-hlac":          return '0 1 0';
+		case "wpn-campingrifle":  return '0.5 1 0';
+		case "wpn-minelayer":     return '0.75 1 0';
 		default:                  return def;
 	}
 }
 string spritelookuptext(string s)
 {
-	if(substring(s, 0, 4) == "wpn-")
-		return (get_weaponinfo(stof(substring(s, 4, strlen(s)))).message);
-
+	if(substring(s, 0, 5) == "buff-") { return Buff_PrettyName(Buff_Type_FromSprite(s)); }
 	switch(s)
 	{
 		case "as-push": return _("Push");
@@ -267,9 +278,26 @@ string spritelookuptext(string s)
 		case "race-finish": return _("Finish");
 		case "race-start": return _("Start");
 		case "race-start-finish": return (race_checkpointtime || race_mycheckpointtime) ? _("Finish") : _("Start");
+		case "goal": return _("Goal");
 		case "nb-ball": return _("Ball");
 		case "ka-ball": return _("Ball");
 		case "ka-ballcarrier": return _("Ball carrier");
+		case "wpn-laser": return _("Laser");
+		case "wpn-shotgun": return _("Shotgun");
+		case "wpn-uzi": return _("Machine Gun");
+		case "wpn-gl": return _("Mortar");
+		case "wpn-electro": return _("Electro");
+		case "wpn-crylink": return _("Crylink");
+		case "wpn-nex": return _("Nex");
+		case "wpn-hagar": return _("Hagar");
+		case "wpn-rl": return _("Rocket Launcher");
+		case "wpn-porto": return _("Port-O-Launch");
+		case "wpn-minstanex": return _("Minstanex");
+		case "wpn-hookgun": return _("Hook");
+		case "wpn-fireball": return _("Fireball");
+		case "wpn-hlac": return _("HLAC");
+		case "wpn-campingrifle": return _("Rifle");
+		case "wpn-minelayer": return _("Mine Layer");
 		case "dom-neut": return _("Control point");
 		case "dom-red": return _("Control point");
 		case "dom-blue": return _("Control point");
@@ -282,7 +310,7 @@ string spritelookuptext(string s)
 		case "item-shield": return _("Shield");
 		case "item-fuelregen": return _("Fuel regen");
 		case "item-jetpack": return _("Jet Pack");
-		case "freezetag_frozen": return _("Frozen!");
+		case "frozen": return _("Frozen!");
 		case "tagged-target": return _("Tagged");
 		case "vehicle": return _("Vehicle");
 		default: return s;