X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fwaypointsprites.qc;h=d3d57aba9e8cbcd52ad7606466f912dc394032a9;hb=e332988cce112231a09d8c9c8c88d889a5fbea83;hp=9e5b199882e4e1662fc123529d40f64a8403f9c8;hpb=b631f3a57eaf188d5b50c6291536b9d41530e102;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/waypointsprites.qc b/qcsrc/client/waypointsprites.qc
index 9e5b19988..d3d57aba9 100644
--- a/qcsrc/client/waypointsprites.qc
+++ b/qcsrc/client/waypointsprites.qc
@@ -216,7 +216,7 @@ float spritelookupblinkvalue(string s)
 		case "item-extralife":   return 2;
 		case "item-speed":       return 2;
 		case "item-strength":    return 2;
-		case "item-shueld":      return 2;
+		case "item-shield":      return 2;
 		case "item-fuelregen":   return 2;
 		case "item-jetpack":     return 2;
 		case "tagged-target":    return 2;
@@ -228,6 +228,22 @@ vector spritelookupcolor(string s, vector def)
 	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;
 	}
 }
@@ -240,6 +256,7 @@ string spritelookuptext(string s)
 		case "as-defend": return _("Defend");
 		case "bluebase": return _("Blue base");
 		case "danger": return _("DANGER");
+		case "enemyflagcarrier": return _("Enemy carrier");
 		case "flagcarrier": return _("Flag carrier");
 		case "flagdropped": return _("Dropped flag");
 		case "helpme": return _("Help me!");
@@ -267,6 +284,7 @@ string spritelookuptext(string s)
 		case "race-checkpoint": return _("Checkpoint");
 		case "race-finish": return _("Finish");
 		case "race-start": return _("Start");
+		case "race-start-finish": return (race_checkpointtime || race_mycheckpointtime) ? _("Finish") : _("Start");
 		case "nb-ball": return _("Ball");
 		case "ka-ball": return _("Ball");
 		case "ka-ballcarrier": return _("Ball carrier");
@@ -363,6 +381,7 @@ vector fixrgbexcess(vector rgb)
 	return rgb;
 }
 
+float waypointsprite_count, waypointsprite_newcount;
 void Draw_WaypointSprite()
 {
 	string spriteimage;
@@ -385,7 +404,7 @@ void Draw_WaypointSprite()
 
 	InterpolateOrigin_Do();
 
-	t = GetPlayerColor(player_localentnum - 1) + 1;
+	t = GetPlayerColor(player_localnum) + 1;
 
 	spriteimage = "";
 
@@ -418,6 +437,8 @@ void Draw_WaypointSprite()
 
 	if(spriteimage == "")
 		return;
+
+	++waypointsprite_newcount;
 	
 	float dist;
 	dist = vlen(self.origin - view_origin);
@@ -522,7 +543,7 @@ void Draw_WaypointSprite()
 	o_z = 0;
 
 	float edgedistance_min, crosshairdistance;
-		edgedistance_min = min4((o_y - (vid_conheight * waypointsprite_edgeoffset_top)), 
+		edgedistance_min = min((o_y - (vid_conheight * waypointsprite_edgeoffset_top)), 
 	(o_x - (vid_conwidth * waypointsprite_edgeoffset_left)),
 	(vid_conwidth - (vid_conwidth * waypointsprite_edgeoffset_right)) - o_x, 
 	(vid_conheight - (vid_conheight * waypointsprite_edgeoffset_bottom)) - o_y);
@@ -566,12 +587,16 @@ void Draw_WaypointSprite()
 	o = drawspritearrow(o, ang, rgb, a, SPRITE_ARROW_SCALE * t);
 	
 	string txt;
-	txt = spritelookuptext(spriteimage);
+	if(autocvar_g_waypointsprite_spam && waypointsprite_count >= autocvar_g_waypointsprite_spam)
+		txt = _("Spam");
+	else
+		txt = spritelookuptext(spriteimage);
 	if(self.helpme && time < self.helpme)
 		txt = sprintf(_("%s needing help!"), txt);
 	if(autocvar_g_waypointsprite_uppercase)
 		txt = strtoupper(txt);
 
+	draw_beginBoldFont();
 	if(self.health >= 0)
 	{
 		o = drawspritetext(o, ang, (SPRITE_HEALTHBAR_WIDTH + 2 * SPRITE_HEALTHBAR_BORDER) * t, rgb, a, waypointsprite_fontsize * '1 1 0', txt);
@@ -607,6 +632,7 @@ void Draw_WaypointSprite()
 	{
 		o = drawspritetext(o, ang, 0, rgb, a, waypointsprite_fontsize * '1 1 0', txt);
 	}
+	draw_endBoldFont();
 }
 
 void Ent_RemoveWaypointSprite()
@@ -775,4 +801,7 @@ void WaypointSprite_Load()
 		WaypointSprite_Load_Frames(".jpg");
 		waypointsprite_initialized = true;
 	}
+
+	waypointsprite_count = waypointsprite_newcount;
+	waypointsprite_newcount = 0;
 }