From: terencehill Date: Tue, 26 Oct 2010 22:15:17 +0000 (+0200) Subject: Use the autocvar X-Git-Tag: xonotic-v0.1.0preview~134^2~6^2~28 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=85c02656f79197efc9eebb04513bc8a71705cd76;p=xonotic%2Fxonotic-data.pk3dir.git Use the autocvar --- diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index 5ac1f965e..e775d5bd0 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -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"); diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc index 4000f30a7..7fbfa33e1 100644 --- a/qcsrc/client/scoreboard.qc +++ b/qcsrc/client/scoreboard.qc @@ -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; diff --git a/qcsrc/client/waypointsprites.qc b/qcsrc/client/waypointsprites.qc index 07e912782..816a2e485 100644 --- a/qcsrc/client/waypointsprites.qc +++ b/qcsrc/client/waypointsprites.qc @@ -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) {