Merge branch 'master' into terencehill/newpanelhud

diff --combined qcsrc/client/View.qc
index 71a1669e775697cc8a5ee4b3c9a34e88d315afb9,704e58107f597a67ec33e3b201a816da196b09fc..8fff465943b988818c19797be17aa600ad44f076
--- 1/qcsrc/client/View.qc
--- 2/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@@ -547,6 -547,10 +547,6 @@@ void CSQC_UpdateView(float w, float h
        // Draw the Engine Status Bar (the default Quake HUD)
        R_SetView(VF_DRAWENGINEHUD, 0);
  
 -      // fetch this one only once per frame
 -      hud_showbinds = autocvar_hud_showbinds;
 -      hud_showbinds_limit = autocvar_hud_showbinds_limit;
 -
        // Update the mouse position
        /*
           mousepos_x = vid_conwidth;
@@@ -568,7 -572,7 +568,7 @@@
        // next R_RenderScene call
        drawstring('0 0 0', "", '1 1 0', '1 1 1', 0, 0);
  
-       if(autocvar_r_fakelight >= 2 || autocvar_r_fullbright >= 1)
+       if(autocvar_r_fakelight >= 2 || autocvar_r_fullbright)
        if not(serverflags & SERVERFLAG_ALLOW_FULLBRIGHT)
        {
                // apply night vision effect
@@@ -1074,8 -1078,6 +1074,8 @@@
                cvar_set("vid_conheight", h0);
        }
  
 +      prev_spectatee_status = spectatee_status;
 +
        if(autocvar__hud_configure)
                HUD_Panel_Mouse();