X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fwaypointsprites.qc;h=9de48dff5261d72f482d7334f20fb53b461809df;hb=a16bfaa11ae87fe6fdab9e6c4504e2c5528ea595;hp=dc38219b510c8442620cc27c701dec8258eb8d4d;hpb=5f9a104fb3f5ef5f8a68d671425290ea8a6f9843;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/waypointsprites.qc b/qcsrc/client/waypointsprites.qc
index dc38219b5..9de48dff5 100644
--- a/qcsrc/client/waypointsprites.qc
+++ b/qcsrc/client/waypointsprites.qc
@@ -8,7 +8,7 @@
 #include "../common/constants.qh"
 #include "../common/teams.qh"
 
-#include "../common/weapons/weapons.qh"
+#include "../common/weapons/all.qh"
 
 #include "../csqcmodellib/interpolate.qh"
 
@@ -54,7 +54,7 @@ void drawquad(vector o, vector ri, vector up, string pic, vector rgb, float a, f
 	R_EndPolygon();
 }
 
-void drawhealthbar(vector org, float rot, float h, vector sz, vector hotspot, float width, float height, float margin, float border, float align, vector rgb, float a, vector hrgb, float ha, float f)
+void drawhealthbar(vector org, float rot, float h, vector sz, vector hotspot, float width, float theheight, float margin, float border, float align, vector rgb, float a, vector hrgb, float ha, float f)
 {
 	vector o, ri, up;
 	float owidth; // outer width
@@ -72,13 +72,13 @@ void drawhealthbar(vector org, float rot, float h, vector sz, vector hotspot, fl
 	up = rotate(up, rot);
 
 	owidth = width + 2 * border;
-	o = o - up * (margin + border + height) + ri * (sz.x - owidth) * 0.5;
+	o = o - up * (margin + border + theheight) + ri * (sz.x - owidth) * 0.5;
 
 	drawquad(o - up * border,                               ri * owidth,    up * border, "", rgb,  a,  f);
-	drawquad(o + up * height,                               ri * owidth,    up * border, "", rgb,  a,  f);
-	drawquad(o,                                             ri * border,    up * height, "", rgb,  a,  f);
-	drawquad(o + ri * (owidth - border),                    ri * border,    up * height, "", rgb,  a,  f);
-	drawquad(o + ri * (border + align * ((1 - h) * width)), ri * width * h, up * height, "", hrgb, ha, f);
+	drawquad(o + up * theheight,                               ri * owidth,    up * border, "", rgb,  a,  f);
+	drawquad(o,                                             ri * border,    up * theheight, "", rgb,  a,  f);
+	drawquad(o + ri * (owidth - border),                    ri * border,    up * theheight, "", rgb,  a,  f);
+	drawquad(o + ri * (border + align * ((1 - h) * width)), ri * width * h, up * theheight, "", hrgb, ha, f);
 }
 
 // returns location of sprite text
@@ -166,6 +166,10 @@ vector drawspritetext(vector o, float ang, float minwidth, vector rgb, float a,
 
 float spritelookupblinkvalue(string s)
 {
+	if(substring(s, 0, 4) == "wpn-")
+	if(get_weaponinfo(stof(substring(s, 4, strlen(s)))).spawnflags & WEP_FLAG_SUPERWEAPON)
+		return 2;
+
 	switch(s)
 	{
 		case "ons-cp-atck-neut": return 2;
@@ -173,6 +177,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;
@@ -220,6 +226,9 @@ string spritelookuptext(string s)
 		case "keycarrier-red": return _("Key carrier");
 		case "keycarrier-yellow": return _("Key carrier");
 		case "redbase": return _("Red base");
+		case "yellowbase": return _("Yellow base");
+		case "neutralbase": return _("White base");
+		case "pinkbase": return _("Pink base");
 		case "waypoint": return _("Waypoint");
 		case "ons-gen-red": return _("Generator");
 		case "ons-gen-blue": return _("Generator");
@@ -245,6 +254,8 @@ 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");
@@ -346,6 +357,14 @@ void Draw_WaypointSprite()
 	// choose the sprite
 	switch(self.rule)
 	{
+		case SPRITERULE_SPECTATOR:
+			if(!(
+				(autocvar_g_waypointsprite_itemstime == 1 && t == NUM_SPECTATOR + 1)
+			||	(autocvar_g_waypointsprite_itemstime == 2 && (t == NUM_SPECTATOR + 1 || warmup_stage))
+				))
+				return;
+			spriteimage = self.netname;
+			break;
 		case SPRITERULE_DEFAULT:
 			if(self.team)
 			{
@@ -399,7 +418,7 @@ void Draw_WaypointSprite()
 	{
 		if(self.helpme && time < self.helpme)
 			a *= SPRITE_HELPME_BLINK;
-		else
+		else if(!self.lifetime) // fading out waypoints don't blink
 			a *= spritelookupblinkvalue(spriteimage);
 	}
 
@@ -409,7 +428,7 @@ void Draw_WaypointSprite()
 		a = 1;
 	}
 
-	if(a <= 0)
+	if(a <= 0.003)
 		return;
 
 	rgb = fixrgbexcess(rgb);