]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Use the autocvar
authorterencehill <piuntn@gmail.com>
Tue, 26 Oct 2010 22:15:17 +0000 (00:15 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 26 Oct 2010 22:15:17 +0000 (00:15 +0200)
qcsrc/client/View.qc
qcsrc/client/scoreboard.qc
qcsrc/client/waypointsprites.qc

index 5ac1f965e3a1d8714da30cd5ebdea66916917257..e775d5bd0bb9dd2ef504dea26c4b64c3af111dbf 100644 (file)
@@ -820,8 +820,8 @@ void CSQC_UpdateView(float w, float h)
                                wcross_alpha_prev = wcross_alpha;
                                wcross_color_prev = wcross_color;
 
-                               wcross_scale *= 1 - cvar("_menu_alpha");
-                               wcross_alpha *= 1 - cvar("_menu_alpha");
+                               wcross_scale *= 1 - autocvar__menu_alpha;
+                               wcross_alpha *= 1 - autocvar__menu_alpha;
 
                                ring_scale = cvar("crosshair_ring_size");
 
index 4000f30a70e00e8ec5792b7994a7746a2eea2b5e..7fbfa33e15c8039dbe643e02e9663f1a4563f74e 100644 (file)
@@ -1106,8 +1106,8 @@ void HUD_DrawScoreboard()
 
        HUD_UpdatePlayerTeams();
 
-       scoreboard_alpha_bg = cvar("scoreboard_alpha_bg") * scoreboard_fade_alpha * (1 - cvar("_menu_alpha"));
-       scoreboard_alpha_fg = cvar_or("scoreboard_alpha_fg", 1.0) * scoreboard_fade_alpha * (1 - cvar("_menu_alpha"));
+       scoreboard_alpha_bg = cvar("scoreboard_alpha_bg") * scoreboard_fade_alpha * (1 - autocvar__menu_alpha);
+       scoreboard_alpha_fg = cvar_or("scoreboard_alpha_fg", 1.0) * scoreboard_fade_alpha * (1 - autocvar__menu_alpha);
        scoreboard_highlight = cvar("scoreboard_highlight");
        scoreboard_highlight_alpha = cvar_or("scoreboard_highlight_alpha", 0.10) * scoreboard_alpha_fg;
        scoreboard_highlight_alpha_self = cvar_or("scoreboard_highlight_alpha_self", 0.25) * scoreboard_alpha_fg;
index 07e9127827dc0131c43a9874c4e4bfca87f23e2c..816a2e4851eb8827eee5505e67e91f99b1e65844 100644 (file)
@@ -425,7 +425,7 @@ 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)
        {