Merge remote-tracking branch 'origin/master' into terencehill/hud_code_restructure

diff --combined qcsrc/client/Main.qc
index e482ce7a047f4c18e02f01b1578e419233317cf4,ecc2000d7ccae32447fa4e78e75460a26e8f1f5a..7a11300ea9f1487a177a00192964bfda94413a34
--- 1/qcsrc/client/Main.qc
--- 2/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@@ -156,8 -156,7 +156,8 @@@ void CSQC_Init(void
        CALL_ACCUMULATED_FUNCTION(RegisterGametypes);
        CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
        CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
 -      
 +      CALL_ACCUMULATED_FUNCTION(RegisterHUD_Panels);
 +
        WaypointSprite_Load();
  
        // precaches
@@@ -180,7 -179,6 +180,6 @@@
        DamageInfo_Precache();
        Vehicles_Precache();
        turrets_precache();
-     Announcer_Precache();
        Tuba_Precache();
        CSQCPlayer_Precache();
        
@@@ -212,6 -210,7 +211,6 @@@
  
        hud_skin_path = strzone(strcat("gfx/hud/", autocvar_hud_skin));
        hud_configure_prev = -1;
 -      tab_panel = -1;
  
        draw_currentSkin = strzone(strcat("gfx/menu/", cvar_string("menu_skin")));
  }
@@@ -1207,10 -1206,6 +1206,6 @@@ float CSQC_Parse_TempEntity(
                        Net_ReadPingPLReport();
                        bHandled = true;
                        break;
-               case TE_CSQC_ANNOUNCE:
-                       Announcer_Play(ReadString());
-                       bHandled = true;
-                       break;
                case TE_CSQC_WEAPONCOMPLAIN:
                        Net_WeaponComplain();
                        bHandled = true;

diff --combined qcsrc/common/constants.qh
index ddfd11b2cb31420043f755adeae55bb3af9a4ce8,ffec62095b9b9466ffcf5db66a75251f254a18f5..ccf2725db7eb2faebc4d85cf77274d8108e72e9d
--- 1/qcsrc/common/constants.qh
--- 2/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@@ -36,14 -36,13 +36,13 @@@ const float TE_CSQC_NEXGUNBEAMPARTICLE 
  const float TE_CSQC_LIGHTNINGARC = 105;
  const float TE_CSQC_TEAMNAGGER = 106;
  const float TE_CSQC_PINGPLREPORT = 107;
- const float TE_CSQC_ANNOUNCE = 108;
- const float TE_CSQC_TARGET_MUSIC = 109;
- const float TE_CSQC_WEAPONCOMPLAIN = 110;
- const float TE_CSQC_NEX_SCOPE = 111;
- const float TE_CSQC_MINELAYER_MAXMINES = 112;
- const float TE_CSQC_HAGAR_MAXROCKETS = 113;
- const float TE_CSQC_VEHICLESETUP = 114;
- const float TE_CSQC_SVNOTICE = 115;
+ const float TE_CSQC_TARGET_MUSIC = 108;
+ const float TE_CSQC_WEAPONCOMPLAIN = 109;
+ const float TE_CSQC_NEX_SCOPE = 110;
+ const float TE_CSQC_MINELAYER_MAXMINES = 111;
+ const float TE_CSQC_HAGAR_MAXROCKETS = 112;
+ const float TE_CSQC_VEHICLESETUP = 113;
+ const float TE_CSQC_SVNOTICE = 114;
  
  const float RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder
  const float RACE_NET_CHECKPOINT_CLEAR = 1;
@@@ -392,6 -391,43 +391,6 @@@ float WR_SWITCHABLE       = 12; // (CSQC) imp
  float WR_PLAYERDEATH    = 13; // (SVQC) does not need to do anything
  float WR_GONETHINK    = 14; // (SVQC) logic to run every frame, also if no longer having the weapon as long as the switch away has not been performed
  
 -float HUD_PANEL_WEAPONS               = 0;
 -float HUD_PANEL_AMMO          = 1;
 -float HUD_PANEL_POWERUPS      = 2;
 -float HUD_PANEL_HEALTHARMOR   = 3;
 -float HUD_PANEL_NOTIFY                = 4;
 -float HUD_PANEL_TIMER         = 5;
 -float HUD_PANEL_RADAR         = 6;
 -float HUD_PANEL_SCORE         = 7;
 -float HUD_PANEL_RACETIMER     = 8;
 -float HUD_PANEL_VOTE          = 9;
 -float HUD_PANEL_MODICONS      = 10;
 -float HUD_PANEL_PRESSEDKEYS   = 11;
 -float HUD_PANEL_CHAT          = 12;
 -float HUD_PANEL_ENGINEINFO    = 13;
 -float HUD_PANEL_INFOMESSAGES  = 14;
 -float HUD_PANEL_PHYSICS       = 15;
 -float HUD_PANEL_CENTERPRINT   = 16;
 -float HUD_PANEL_NUM           = 17; // always last panel id + 1, please increment when adding a new panel
 -
 -string HUD_PANELNAME_WEAPONS          = "weapons";
 -string HUD_PANELNAME_AMMO             = "ammo";
 -string HUD_PANELNAME_POWERUPS         = "powerups";
 -string HUD_PANELNAME_HEALTHARMOR      = "healtharmor";
 -string HUD_PANELNAME_NOTIFY           = "notify";
 -string HUD_PANELNAME_TIMER            = "timer";
 -string HUD_PANELNAME_RADAR            = "radar";
 -string HUD_PANELNAME_SCORE            = "score";
 -string HUD_PANELNAME_RACETIMER                = "racetimer";
 -string HUD_PANELNAME_VOTE             = "vote";
 -string HUD_PANELNAME_MODICONS         = "modicons";
 -string HUD_PANELNAME_PRESSEDKEYS      = "pressedkeys";
 -string HUD_PANELNAME_CHAT             = "chat";
 -string HUD_PANELNAME_ENGINEINFO               = "engineinfo";
 -string HUD_PANELNAME_INFOMESSAGES     = "infomessages";
 -string HUD_PANELNAME_PHYSICS  = "physics";
 -string HUD_PANELNAME_CENTERPRINT      = "centerprint";
 -
  #define SERVERFLAG_ALLOW_FULLBRIGHT 1
  #define SERVERFLAG_TEAMPLAY 2
  #define SERVERFLAG_PLAYERSTATS 4

diff --combined qcsrc/common/util.qh
index 421f6126ba4b47486a2457d3ec304bfb8cfba4d5,df910e353927a2593f56a7d5f245d0d29702f0ed..e9bd01cfa4d34fdacb55dc1c16cd1a92b94ef1cd
--- 1/qcsrc/common/util.qh
--- 2/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@@ -264,6 -264,34 +264,6 @@@ float get_model_parameters_fixbone
  string get_model_parameters_desc;
  float get_model_parameters(string mod, float skn); // call with string_null to clear; skin -1 means mod is the filename of the txt file and is to be split
  
 -// stupid stupid stupid FTEQCC has a max limit on macro sizes, let's work around by splitting the macro into two macros! :(
 -#define HUD_Panel_GetName_Part2(id) \
 -switch(id) {\
 -      case HUD_PANEL_ENGINEINFO: panel_name = HUD_PANELNAME_ENGINEINFO; break; \
 -      case HUD_PANEL_INFOMESSAGES: panel_name = HUD_PANELNAME_INFOMESSAGES; break; \
 -      case HUD_PANEL_PHYSICS: panel_name = HUD_PANELNAME_PHYSICS; break; \
 -      case HUD_PANEL_CENTERPRINT: panel_name = HUD_PANELNAME_CENTERPRINT; break; \
 -} ENDS_WITH_CURLY_BRACE
 -
 -// Get name of specified panel id
 -#define HUD_Panel_GetName(id) \
 -switch(id) { \
 -      case HUD_PANEL_WEAPONS: panel_name = HUD_PANELNAME_WEAPONS; break; \
 -      case HUD_PANEL_AMMO: panel_name = HUD_PANELNAME_AMMO; break; \
 -      case HUD_PANEL_POWERUPS: panel_name = HUD_PANELNAME_POWERUPS; break; \
 -      case HUD_PANEL_HEALTHARMOR: panel_name = HUD_PANELNAME_HEALTHARMOR; break; \
 -      case HUD_PANEL_NOTIFY: panel_name = HUD_PANELNAME_NOTIFY; break; \
 -      case HUD_PANEL_TIMER: panel_name = HUD_PANELNAME_TIMER; break; \
 -      case HUD_PANEL_RADAR: panel_name = HUD_PANELNAME_RADAR; break; \
 -      case HUD_PANEL_SCORE: panel_name = HUD_PANELNAME_SCORE; break; \
 -      case HUD_PANEL_RACETIMER: panel_name = HUD_PANELNAME_RACETIMER; break; \
 -      case HUD_PANEL_VOTE: panel_name = HUD_PANELNAME_VOTE; break; \
 -      case HUD_PANEL_MODICONS: panel_name = HUD_PANELNAME_MODICONS; break; \
 -      case HUD_PANEL_PRESSEDKEYS: panel_name = HUD_PANELNAME_PRESSEDKEYS; break; \
 -      case HUD_PANEL_CHAT: panel_name = HUD_PANELNAME_CHAT; break; \
 -    default: HUD_Panel_GetName_Part2(id)\
 -}
 -
  vector vec2(vector v);
  
  #ifndef MENUQC
@@@ -402,3 -430,7 +402,7 @@@ void dedicated_print(string input)
  #define PROGNAME "CSQC"
  #endif
  #endif
+ 
+ #ifndef MENUQC
+ float Announcer_PickNumber(float num);
+ #endif