X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fwaypointsprites.qc;h=816a2e4851eb8827eee5505e67e91f99b1e65844;hp=6c7dc9480ae4d5b4de633c5a5555e0388c2ddff3;hb=26c8963b7747f4c53fc541df0dd71b7024d1d496;hpb=0e7ed909bffb4ff21f0c68d163edfc17487e380a

diff --git a/qcsrc/client/waypointsprites.qc b/qcsrc/client/waypointsprites.qc
index 6c7dc9480..816a2e485 100644
--- a/qcsrc/client/waypointsprites.qc
+++ b/qcsrc/client/waypointsprites.qc
@@ -166,7 +166,7 @@ void Draw_WaypointSprite()
 	dist = vlen(self.origin - view_origin);
 	
 	float a;
-	a = self.alpha * sbar_alpha_fg;
+	a = self.alpha * autocvar_hud_panel_fg_alpha;
 
 	if(self.maxdistance > waypointsprite_normdistance)
 		a *= pow(bound(0, (self.maxdistance - dist) / (self.maxdistance - waypointsprite_normdistance), 1), waypointsprite_distancealphaexponent);
@@ -425,22 +425,34 @@ void WaypointSprite_Load()
 	waypointsprite_distancefadealpha = cvar_or("g_waypointsprite_distancefadealpha", 1);
 	waypointsprite_distancefadescale = cvar_or("g_waypointsprite_distancefadescale", 1);
 	waypointsprite_distancefadedistance = vlen(mi_max - mi_min) * cvar_or("g_waypointsprite_distancefadedistancemultiplier", 1);
-	waypointsprite_alpha = cvar_or("g_waypointsprite_alpha", 1) * (1 - cvar("_menu_alpha"));
+	waypointsprite_alpha = cvar_or("g_waypointsprite_alpha", 1) * (1 - autocvar__menu_alpha);
 
 	if(!waypointsprite_initialized)
 	{
 		float dh, n, i, o, f;
 		string s, sname, sframes;
+
 		dh = search_begin("models/sprites/*_frame*.tga", FALSE, FALSE);
 		n = search_getsize(dh);
 		for(i = 0; i < n; ++i)
 		{
 			s = search_getfilename(dh, i);
-			if(substring(s, 0, 15) != "models/sprites/")
-				continue;
-			if(substring(s, strlen(s) - 4, 4) != ".tga")
-				continue;
-			s = substring(s, 15, strlen(s) - 19);
+			s = substring(s, 15, strlen(s) - 15 - 4); // strip models/sprites/ and .tga
+
+			o = strstrofs(s, "_frame", 0);
+			sname = strcat("/spriteframes/", substring(s, 0, o));
+			sframes = substring(s, o + 6, strlen(s) - o - 6);
+			f = stof(sframes) + 1;
+			db_put(tempdb, sname, ftos(max(f, stof(db_get(tempdb, sname)))));
+		}
+		search_end(dh);
+
+		dh = search_begin("models/sprites/*_frame*.jpg", FALSE, FALSE);
+		n = search_getsize(dh);
+		for(i = 0; i < n; ++i)
+		{
+			s = search_getfilename(dh, i);
+			s = substring(s, 15, strlen(s) - 15 - 4); // strip models/sprites/ and .jpg
 
 			o = strstrofs(s, "_frame", 0);
 			sname = strcat("/spriteframes/", substring(s, 0, o));