From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 9 Dec 2010 20:04:43 +0000 (+0100)
Subject: Merge remote branch 'origin/terencehill/small_cleanup'
X-Git-Tag: xonotic-v0.1.0preview~64
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3188aedc78fc6c0f613adbfe8f1297ef5cb6a730;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/terencehill/small_cleanup'

Conflicts:
	qcsrc/client/waypointsprites.qc
---

3188aedc78fc6c0f613adbfe8f1297ef5cb6a730
diff --cc qcsrc/client/waypointsprites.qc
index 8584d24f2,7df28a96b..fad229f6a
--- a/qcsrc/client/waypointsprites.qc
+++ b/qcsrc/client/waypointsprites.qc
@@@ -409,23 -409,23 +409,22 @@@ void Ent_WaypointSprite(
  
  void WaypointSprite_Load()
  {
- 	waypointsprite_fadedistance = vlen(mi_max - mi_min);
+ 	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 = vlen(mi_max - mi_min) * autocvar_g_waypointsprite_distancefadedistancemultiplier;
- 	waypointsprite_alpha = autocvar_g_waypointsprite_alpha * (1 - autocvar__menu_alpha);
++	waypointsprite_distancefadedistance = waypointsprite_fadedistance * autocvar_g_waypointsprite_distancefadedistancemultiplier;
  
  	if(!waypointsprite_initialized)
  	{