Merge branch 'master' into Mario/buff_updates

diff --combined qcsrc/client/hud.qc
index 85f197711832b17ac3938320f00fba23964cf8b7,74a5df16627d45735fbbbbb876475ea428da3bf8..dfe52049b16ed8c6ed79c7140dd9ab54de9f9227
--- 1/qcsrc/client/hud.qc
--- 2/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -4286,12 -4286,12 +4286,12 @@@ void HUD_CenterPrint (void
        {
                if(!autocvar_hud_panel_centerprint) return;
  
-               if (hud_configure_prev && hud_configure_prev != -1)
+               if(hud_configure_prev)
                        reset_centerprint_messages();
        }
        else
        {
-               if (!hud_configure_prev)
+               if(!hud_configure_prev)
                        reset_centerprint_messages();
                if (time > hud_configure_cp_generation_time)
                {
@@@ -4522,7 -4522,8 +4522,7 @@@ void HUD_Buffs(void
        }
  
        HUD_Panel_UpdateCvars();
 -
 -      draw_beginBoldFont();
 +      
  
        vector pos, mySize;
        pos = panel_pos;
@@@ -4540,16 -4541,8 +4540,16 @@@
        //float buff_iconalign = autocvar_hud_panel_buffs_iconalign;
        vector buff_offset = '0 0 0';
  
 +      draw_beginBoldFont();
 +      float buff_time, buff_maxtime;
 +      buff_time = bound(0, getstatf(STAT_BUFF_TIME) - time, 99);
 +      buff_maxtime = 60; // TODO: stat?
        for(e = Buff_Type_first; e; e = e.enemy) if(buffs & e.items)
        {
 +              if(buff_time && autocvar_hud_panel_buffs_progressbar)
 +                      HUD_Panel_DrawProgressBar(pos + buff_offset, mySize, autocvar_hud_panel_buffs_progressbar_name, buff_time/buff_maxtime, 0, 0, 
 +                                                                        Buff_Color(e.items) * -1 + '1 1 1', (autocvar_hud_progressbar_alpha * panel_fg_alpha) * 0.4, DRAWFLAG_NORMAL);
 +
                //DrawNumIcon(pos + buff_offset, mySize, shield, "shield", is_vertical, buff_iconalign, '1 1 1', 1);
                drawcolorcodedstring_aspect(pos + buff_offset, s, mySize, panel_fg_alpha * 0.5, DRAWFLAG_NORMAL);
        }

diff --combined qcsrc/client/hud_config.qc
index 3f79abd3de2196d9144e8ffa39267d2610956caf,4ddc049ba167395173809af150f5cd88707525ac..0b200490d232180d4a3970dd63998a936641a6c6
--- 1/qcsrc/client/hud_config.qc
--- 2/qcsrc/client/hud_config.qc
+++ b/qcsrc/client/hud_config.qc
@@@ -204,9 -204,6 +204,9 @@@ void HUD_Panel_ExportCfg(string cfgname
                                        HUD_Write_PanelCvar_q("_fade_subsequent_minfontsize");
                                        HUD_Write_PanelCvar_q("_fade_minfontsize");
                                        break;
 +                              case HUD_PANEL_BUFFS:
 +                                      HUD_Write_PanelCvar_q("_progressbar");
 +                                      HUD_Write_PanelCvar_q("_progressbar_name");
                        }
                        HUD_Write("\n");
                }
@@@ -1236,7 -1233,7 +1236,7 @@@ void HUD_Configure_Frame(
                        return;
                }
  
-               if(!hud_configure_prev || hud_configure_prev == -1)
+               if(!hud_configure_prev)
                {
                        if(autocvar_hud_cursormode)
                                setcursormode(1);