Merge branch 'terencehill/hud_cleanups' into 'master'

HUD cleanups

* Code cleanups of normal and vehicle HUD + crosshair, with minor fixes and improvements (vehicle HUD now fades in/out)
* Small cleanup and fix to the HUD editor (minigame panels weren't properly hidden)

See merge request !240

diff --combined qcsrc/client/hud.qc
index 042536aa767e91250fbd49d7dc504e56869f057d,5ead970345f2b10a4d7152c1a86c822263cd9c6f..a00a9c3a4c2188f3ca0c3044561f35379c38a926
--- 1/qcsrc/client/hud.qc
--- 2/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -13,8 -13,7 +13,8 @@@
  #include "../common/nades/all.qh"
  #include "../common/stats.qh"
  #include "../lib/csqcmodel/cl_player.qh"
 -#include "../server/mutators/gamemode_ctf.qh"
 +// TODO: remove
 +#include "../server/mutators/mutator/gamemode_ctf.qc"
  
  
  /*
@@@ -367,7 -366,6 +367,6 @@@ void HUD_Weapons(void
        vector color;
  
        // check to see if we want to continue
-       if(intermission == 2) return;
        if(hud != HUD_NORMAL) return;
  
        if(!autocvar__hud_configure)
@@@ -953,7 -951,6 +952,6 @@@ int nade_prevframe
  float nade_statuschange_time;
  void HUD_Ammo(void)
  {
-       if(intermission == 2) return;
        if(hud != HUD_NORMAL) return;
        if(!autocvar__hud_configure)
        {
@@@ -1228,8 -1225,6 +1226,6 @@@ int getPowerupItemAlign(int align, int 
  
  void HUD_Powerups()
  {
-       if(intermission == 2) return;
- 
        int allItems = getstati(STAT_ITEMS, 0, 24);
        int allBuffs = getstati(STAT_BUFFS, 0, 24);
        int strengthTime, shieldTime, superTime;
@@@ -1393,7 -1388,6 +1389,6 @@@
  void HUD_HealthArmor(void)
  {
        int armor, health, fuel;
-       if(intermission == 2) return;
        if(!autocvar__hud_configure)
        {
                if(!autocvar_hud_panel_healtharmor) return;
@@@ -1700,7 -1694,6 +1695,6 @@@ void HUD_Notify_Push(string icon, strin
  
  void HUD_Notify(void)
  {
-       if(intermission == 2) return;
        if (!autocvar__hud_configure)
                if (!autocvar_hud_panel_notify)
                        return;
@@@ -1814,7 -1807,6 +1808,6 @@@
  
  void HUD_Timer(void)
  {
-       if(intermission == 2) return;
        if(!autocvar__hud_configure)
        {
                if(!autocvar_hud_panel_timer) return;
@@@ -2035,7 -2027,6 +2028,6 @@@ void HUD_Radar_Mouse(
  
  void HUD_Radar(void)
  {
-       if(intermission == 2) return;
        if (!autocvar__hud_configure)
        {
                if (hud_panel_radar_maximized)
@@@ -2384,7 -2375,6 +2376,6 @@@ void HUD_Score_Rankings(vector pos, vec
  
  void HUD_Score(void)
  {
-       if(intermission == 2) return;
        if(!autocvar__hud_configure)
        {
                if(!autocvar_hud_panel_score) return;
@@@ -2568,7 -2558,6 +2559,6 @@@
  //
  void HUD_RaceTimer (void)
  {
-       if(intermission == 2) return;
        if(!autocvar__hud_configure)
        {
                if(!autocvar_hud_panel_racetimer) return;
@@@ -2719,7 -2708,6 +2709,6 @@@
  
  void HUD_Vote(void)
  {
-       if(intermission == 2) return;
        if(autocvar_cl_allow_uid2name == -1 && (gametype == MAPINFO_TYPE_CTS || gametype == MAPINFO_TYPE_RACE || (serverflags & SERVERFLAG_PLAYERSTATS)))
        {
                vote_active = 1;
@@@ -3596,7 -3584,6 +3585,6 @@@ float mod_change; // "time" when mod_ac
  
  void HUD_ModIcons(void)
  {
-       if(intermission == 2) return;
        if(!autocvar__hud_configure)
        {
                if(!autocvar_hud_panel_modicons) return;
@@@ -3638,7 -3625,6 +3626,6 @@@
  //
  void HUD_PressedKeys(void)
  {
-       if(intermission == 2) return;
        if(!autocvar__hud_configure)
        {
                if(!autocvar_hud_panel_pressedkeys) return;
@@@ -3802,7 -3788,6 +3789,6 @@@ float frametimeavg1; // 1 frame ag
  float frametimeavg2; // 2 frames ago
  void HUD_EngineInfo(void)
  {
-       //if(intermission == 2) return;
        if(!autocvar__hud_configure)
        {
                if(!autocvar_hud_panel_engineinfo) return;
@@@ -3864,7 -3849,6 +3850,6 @@@
  } while(0)
  void HUD_InfoMessages(void)
  {
-       if(intermission == 2) return;
        if(!autocvar__hud_configure)
        {
                if(!autocvar_hud_panel_infomessages) return;
@@@ -4046,7 -4030,6 +4031,6 @@@ float acc_prevtime, acc_avg, top_speed
  float physics_update_time, discrete_speed, discrete_acceleration;
  void HUD_Physics(void)
  {
-       if(intermission == 2) return;
        if(!autocvar__hud_configure)
        {
                if(!autocvar_hud_panel_physics) return;
@@@ -4438,7 -4421,6 +4422,6 @@@ void reset_centerprint_messages(void
  float hud_configure_cp_generation_time;
  void HUD_CenterPrint (void)
  {
-       if(intermission == 2) return;
        if(!autocvar__hud_configure)
        {
                if(!autocvar_hud_panel_centerprint) return;
@@@ -4682,28 -4664,48 +4665,48 @@@ Main HUD syste
  ==================
  */
  
+ void HUD_Vehicle()
+ {
+       if(autocvar__hud_configure) return;
+       if(intermission == 2) return;
+ 
+       if(hud == HUD_BUMBLEBEE_GUN)
+               CSQC_BUMBLE_GUN_HUD();
+       else {
+               Vehicle info = get_vehicleinfo(hud);
+               info.vr_hud(info);
+       }
+ }
+ 
  bool HUD_Panel_CheckFlags(int showflags)
  {
        if ( HUD_Minigame_Showpanels() )
                return showflags & PANEL_SHOW_MINIGAME;
+       if(intermission == 2)
+               return showflags & PANEL_SHOW_MAPVOTE;
        return showflags & PANEL_SHOW_MAINGAME;
  }
  
  void HUD_Panel_Draw(entity panent)
  {
        panel = panent;
-       if ( HUD_Panel_CheckFlags(panel.panel_showflags) )
+       if(autocvar__hud_configure)
+       {
+               if(panel.panel_configflags & PANEL_CONFIG_MAIN)
+                       panel.panel_draw();
+       }
+       else if(HUD_Panel_CheckFlags(panel.panel_showflags))
                panel.panel_draw();
  }
  
- void HUD_Reset (void)
+ void HUD_Reset(void)
  {
        // reset gametype specific icons
        if(gametype == MAPINFO_TYPE_CTF)
                HUD_Mod_CTF_Reset();
  }
  
- void HUD_Main (void)
+ void HUD_Main(void)
  {
        int i;
        // global hud theAlpha fade
@@@ -4832,6 -4834,8 +4835,8 @@@
        for(i = hud_panels_COUNT - 1; i >= 0; --i)
                HUD_Panel_Draw(hud_panels[panel_order[i]]);
  
+       HUD_Vehicle();
+ 
        hud_draw_maximized = 1; // panels that may be maximized must check this var
        // draw maximized panels on top
        if(hud_panel_radar_maximized)
@@@ -4841,6 -4845,9 +4846,9 @@@
        if(hud_panel_quickmenu)
                HUD_Panel_Draw(HUD_PANEL(QUICKMENU));
  
+       if (scoreboard_active || intermission == 2)
+               HUD_Reset();
+ 
        HUD_Configure_PostDraw();
  
        hud_configure_prev = autocvar__hud_configure;