X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fwaypointsprites.qc;h=fad229f6a914ca905ae2f0a02da164ad7c9d24f7;hp=7df28a96bab6e13f82f7e5e1f9791a9962045fb3;hb=3188aedc78fc6c0f613adbfe8f1297ef5cb6a730;hpb=86b7c6ee347d181bee3f477cda4e9bfd25882be1

diff --git a/qcsrc/client/waypointsprites.qc b/qcsrc/client/waypointsprites.qc
index 7df28a96ba..fad229f6a9 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();
@@ -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;
 		*/
 
@@ -410,22 +410,21 @@ void Ent_WaypointSprite()
 void WaypointSprite_Load()
 {
 	waypointsprite_fadedistance = vlen(mi_scale);
-	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 = waypointsprite_fadedistance * cvar_or("g_waypointsprite_distancefadedistancemultiplier", 1);
-	waypointsprite_alpha = cvar_or("g_waypointsprite_alpha", 1) * (1 - autocvar__menu_alpha);
+	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;
 
 	if(!waypointsprite_initialized)
 	{