X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fwaypointsprites.qc;h=8ecadaeb857f72f4745a33b2cd3d2748e774a388;hp=db0fdb83fd81a3dd46293211d9eca60df94157ad;hb=2886ed5676755f4242704d64d3315124026496bb;hpb=85ff31f9ec26adf70f835d95184f6dded9d0c785

diff --git a/qcsrc/client/waypointsprites.qc b/qcsrc/client/waypointsprites.qc
index db0fdb83f..8ecadaeb8 100644
--- a/qcsrc/client/waypointsprites.qc
+++ b/qcsrc/client/waypointsprites.qc
@@ -119,11 +119,11 @@ void Draw_WaypointSprite()
 	if(self.hideflags & 2)
 		return; // radar only
 
-	if(cvar("cl_hidewaypoints") >= 2)
+	if(autocvar_cl_hidewaypoints >= 2)
 		return;
 
 	if(self.hideflags & 1)
-		if(cvar("cl_hidewaypoints"))
+		if(autocvar_cl_hidewaypoints)
 			return; // fixed waypoint
 
 	InterpolateOrigin_Do();
@@ -166,7 +166,7 @@ void Draw_WaypointSprite()
 	dist = vlen(self.origin - view_origin);
 	
 	float a;
-	a = self.alpha * hud_fg_alpha;
+	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);
@@ -198,7 +198,7 @@ void Draw_WaypointSprite()
 		d = o - '0.5 0 0' * vid_conwidth - '0 0.5 0' * vid_conheight;
 
 		/*
-		if(cvar("v_flipped"))
+		if(autocvar_v_flipped)
 			d_x = -d_x;
 		*/
 
@@ -336,7 +336,6 @@ void Ent_WaypointSprite()
 			else
 				self.build_starthealth = 0;
 			self.build_finished = servertime + t / 32;
-			//print("build: ", ftos(self.build_finished - self.build_started), "\n");
 		}
 	}
 	else
@@ -409,38 +408,50 @@ void Ent_WaypointSprite()
 
 void WaypointSprite_Load()
 {
-	waypointsprite_fadedistance = vlen(mi_max - mi_min);
-	waypointsprite_normdistance = cvar("g_waypointsprite_normdistance");
-	waypointsprite_minscale = cvar("g_waypointsprite_minscale");
-	waypointsprite_minalpha = cvar("g_waypointsprite_minalpha");
-	waypointsprite_distancealphaexponent = cvar("g_waypointsprite_distancealphaexponent");
-	waypointsprite_timealphaexponent = cvar("g_waypointsprite_timealphaexponent");
-	waypointsprite_scale = cvar_or("g_waypointsprite_scale", 1);
-	waypointsprite_edgefadealpha = cvar_or("g_waypointsprite_edgefadealpha", 1);
-	waypointsprite_edgefadescale = cvar_or("g_waypointsprite_edgefadescale", 1);
-	waypointsprite_edgefadedistance = cvar("g_waypointsprite_edgefadedistance");
-	waypointsprite_crosshairfadealpha = cvar_or("g_waypointsprite_crosshairfadealpha", 1);
-	waypointsprite_crosshairfadescale = cvar_or("g_waypointsprite_crosshairfadescale", 1);
-	waypointsprite_crosshairfadedistance = cvar("g_waypointsprite_crosshairfadedistance");
-	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_fadedistance = vlen(mi_scale);
+	waypointsprite_normdistance = autocvar_g_waypointsprite_normdistance;
+	waypointsprite_minscale = autocvar_g_waypointsprite_minscale;
+	waypointsprite_minalpha = autocvar_g_waypointsprite_minalpha;
+	waypointsprite_distancealphaexponent = autocvar_g_waypointsprite_distancealphaexponent;
+	waypointsprite_timealphaexponent = autocvar_g_waypointsprite_timealphaexponent;
+	waypointsprite_scale = autocvar_g_waypointsprite_scale;
+	waypointsprite_edgefadealpha = autocvar_g_waypointsprite_edgefadealpha;
+	waypointsprite_edgefadescale = autocvar_g_waypointsprite_edgefadescale;
+	waypointsprite_edgefadedistance = autocvar_g_waypointsprite_edgefadedistance;
+	waypointsprite_crosshairfadealpha = autocvar_g_waypointsprite_crosshairfadealpha;
+	waypointsprite_crosshairfadescale = autocvar_g_waypointsprite_crosshairfadescale;
+	waypointsprite_crosshairfadedistance = autocvar_g_waypointsprite_crosshairfadedistance;
+	waypointsprite_distancefadealpha = autocvar_g_waypointsprite_distancefadealpha;
+	waypointsprite_distancefadescale = autocvar_g_waypointsprite_distancefadescale;
+	waypointsprite_distancefadedistance = waypointsprite_fadedistance * autocvar_g_waypointsprite_distancefadedistancemultiplier;
+	waypointsprite_alpha = autocvar_g_waypointsprite_alpha * (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));
@@ -449,6 +460,6 @@ void WaypointSprite_Load()
 			db_put(tempdb, sname, ftos(max(f, stof(db_get(tempdb, sname)))));
 		}
 		search_end(dh);
+		waypointsprite_initialized = true;
 	}
-	waypointsprite_initialized = 1;
 }