From ff8cf14366390f194fae5fc71d243eb293afdff1 Mon Sep 17 00:00:00 2001 From: fruitiex Date: Fri, 11 Sep 2009 17:42:53 +0000 Subject: [PATCH] also hide crosshair when the menu is opened git-svn-id: svn://svn.icculus.org/nexuiz/trunk@7741 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/client/View.qc | 4 ++-- data/qcsrc/client/sbar.qc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc index fff77ed84..a87661ae8 100644 --- a/data/qcsrc/client/View.qc +++ b/data/qcsrc/client/View.qc @@ -613,8 +613,8 @@ void CSQC_UpdateView(float w, float h) wcross_color_x = cvar("crosshair_color_red"); wcross_color_y = cvar("crosshair_color_green"); wcross_color_z = cvar("crosshair_color_blue"); - wcross_alpha = cvar("crosshair_color_alpha"); - wcross_sizefloat = cvar("crosshair_size"); + wcross_alpha = cvar("crosshair_color_alpha") * (1-cvar("_menu_alpha")); + wcross_sizefloat = cvar("crosshair_size") * (1-cvar("_menu_alpha")); if (cvar("crosshair_per_weapon")) { e = get_weaponinfo(activeweapon); if (e && e.netname != "") diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc index cf212bd98..3b4d141cd 100644 --- a/data/qcsrc/client/sbar.qc +++ b/data/qcsrc/client/sbar.qc @@ -2197,7 +2197,7 @@ void Sbar_Draw (void) pos_x = bottomleft_x; pos_y = bottom_y - 50 - sbar_fontsize_spec_y; s = textShortenToWidth(s, vid_conwidth/2.5/sbar_fontsize_spec_x, stringwidth_colors); - drawcolorcodedstring(pos, s, sbar_fontsize_spec, 1, DRAWFLAG_NORMAL); + drawcolorcodedstring(pos, s, sbar_fontsize_spec, sbar_alpha_fg, DRAWFLAG_NORMAL); // spectator text in the upper right corner if(spectatee_status == -1) -- 2.39.2