HUD: split panels into files
authorTimePath <andrew.hardaker1995@gmail.com>
Thu, 5 Nov 2015 03:06:38 +0000 (14:06 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Thu, 5 Nov 2015 03:06:38 +0000 (14:06 +1100)
40 files changed:
qcsrc/client/commands/cl_cmd.qc
qcsrc/client/hud.qc [deleted file]
qcsrc/client/hud.qh [deleted file]
qcsrc/client/hud/all.inc [new file with mode: 0644]
qcsrc/client/hud/all.qc [new file with mode: 0644]
qcsrc/client/hud/all.qh [new file with mode: 0644]
qcsrc/client/hud/hud.qc [new file with mode: 0644]
qcsrc/client/hud/hud.qh [new file with mode: 0644]
qcsrc/client/hud/hud_config.qc [new file with mode: 0644]
qcsrc/client/hud/hud_config.qh [new file with mode: 0644]
qcsrc/client/hud/panel/ammo.qc [new file with mode: 0644]
qcsrc/client/hud/panel/centerprint.qc [new file with mode: 0644]
qcsrc/client/hud/panel/chat.qc [new file with mode: 0644]
qcsrc/client/hud/panel/engineinfo.qc [new file with mode: 0644]
qcsrc/client/hud/panel/healtharmor.qc [new file with mode: 0644]
qcsrc/client/hud/panel/infomessages.qc [new file with mode: 0644]
qcsrc/client/hud/panel/minigame.qc [new file with mode: 0644]
qcsrc/client/hud/panel/modicons.qc [new file with mode: 0644]
qcsrc/client/hud/panel/notify.qc [new file with mode: 0644]
qcsrc/client/hud/panel/physics.qc [new file with mode: 0644]
qcsrc/client/hud/panel/powerups.qc [new file with mode: 0644]
qcsrc/client/hud/panel/pressedkeys.qc [new file with mode: 0644]
qcsrc/client/hud/panel/quickmenu.qc [new file with mode: 0644]
qcsrc/client/hud/panel/racetimer.qc [new file with mode: 0644]
qcsrc/client/hud/panel/radar.qc [new file with mode: 0644]
qcsrc/client/hud/panel/score.qc [new file with mode: 0644]
qcsrc/client/hud/panel/timer.qc [new file with mode: 0644]
qcsrc/client/hud/panel/vote.qc [new file with mode: 0644]
qcsrc/client/hud/panel/weapons.qc [new file with mode: 0644]
qcsrc/client/hud_config.qc [deleted file]
qcsrc/client/hud_config.qh [deleted file]
qcsrc/client/main.qc
qcsrc/client/mapvoting.qc
qcsrc/client/miscfunctions.qc
qcsrc/client/progs.inc
qcsrc/client/quickmenu.qc
qcsrc/client/scoreboard.qc
qcsrc/client/shownames.qc
qcsrc/client/teamradar.qc
qcsrc/client/view.qc

index 489e86c..1c83438 100644 (file)
@@ -8,8 +8,7 @@
 
 #include "../autocvars.qh"
 #include "../defs.qh"
-#include "../hud.qh"
-#include "../hud_config.qh"
+#include "../hud/all.qh"
 #include "../main.qh"
 #include "../mapvoting.qh"
 #include "../miscfunctions.qh"
diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
deleted file mode 100644 (file)
index 3ec2a21..0000000
+++ /dev/null
@@ -1,4857 +0,0 @@
-#include "hud.qh"
-
-#include "hud_config.qh"
-#include "mapvoting.qh"
-#include "scoreboard.qh"
-#include "teamradar.qh"
-#include "t_items.qh"
-#include "../common/buffs/all.qh"
-#include "../common/deathtypes/all.qh"
-#include "../common/items/all.qc"
-#include "../common/mapinfo.qh"
-#include "../common/mutators/mutator/waypoints/all.qh"
-#include "../common/nades/all.qh"
-#include "../common/stats.qh"
-#include "../lib/csqcmodel/cl_player.qh"
-// TODO: remove
-#include "../server/mutators/mutator/gamemode_ctf.qc"
-
-
-/*
-==================
-Misc HUD functions
-==================
-*/
-
-vector HUD_Get_Num_Color (float x, float maxvalue)
-{
-       float blinkingamt;
-       vector color;
-       if(x >= maxvalue) {
-               color.x = sin(2*M_PI*time);
-               color.y = 1;
-               color.z = sin(2*M_PI*time);
-       }
-       else if(x > maxvalue * 0.75) {
-               color.x = 0.4 - (x-150)*0.02 * 0.4; //red value between 0.4 -> 0
-               color.y = 0.9 + (x-150)*0.02 * 0.1; // green value between 0.9 -> 1
-               color.z = 0;
-       }
-       else if(x > maxvalue * 0.5) {
-               color.x = 1 - (x-100)*0.02 * 0.6; //red value between 1 -> 0.4
-               color.y = 1 - (x-100)*0.02 * 0.1; // green value between 1 -> 0.9
-               color.z = 1 - (x-100)*0.02; // blue value between 1 -> 0
-       }
-       else if(x > maxvalue * 0.25) {
-               color.x = 1;
-               color.y = 1;
-               color.z = 0.2 + (x-50)*0.02 * 0.8; // blue value between 0.2 -> 1
-       }
-       else if(x > maxvalue * 0.1) {
-               color.x = 1;
-               color.y = (x-20)*90/27/100; // green value between 0 -> 1
-               color.z = (x-20)*90/27/100 * 0.2; // blue value between 0 -> 0.2
-       }
-       else {
-               color.x = 1;
-               color.y = 0;
-               color.z = 0;
-       }
-
-       blinkingamt = (1 - x/maxvalue/0.25);
-       if(blinkingamt > 0)
-       {
-               color.x = color.x - color.x * blinkingamt * sin(2*M_PI*time);
-               color.y = color.y - color.y * blinkingamt * sin(2*M_PI*time);
-               color.z = color.z - color.z * blinkingamt * sin(2*M_PI*time);
-       }
-       return color;
-}
-
-float HUD_GetRowCount(int item_count, vector size, float item_aspect)
-{
-       float aspect = size_y / size_x;
-       return bound(1, floor((sqrt(4 * item_aspect * aspect * item_count + aspect * aspect) + aspect + 0.5) / 2), item_count);
-}
-
-vector HUD_GetTableSize_BestItemAR(int item_count, vector psize, float item_aspect)
-{
-       float columns, rows;
-       float ratio, best_ratio = 0;
-       float best_columns = 1, best_rows = 1;
-       bool vertical = (psize.x / psize.y >= item_aspect);
-       if(vertical)
-       {
-               psize = eX * psize.y + eY * psize.x;
-               item_aspect = 1 / item_aspect;
-       }
-
-       rows = ceil(sqrt(item_count));
-       columns = ceil(item_count/rows);
-       while(columns >= 1)
-       {
-               ratio = (psize.x/columns) / (psize.y/rows);
-               if(ratio > item_aspect)
-                       ratio = item_aspect * item_aspect / ratio;
-
-               if(ratio <= best_ratio)
-                       break; // ratio starts decreasing by now, skip next configurations
-
-               best_columns = columns;
-               best_rows = rows;
-               best_ratio = ratio;
-
-               if(columns == 1)
-                       break;
-
-               --columns;
-               rows = ceil(item_count/columns);
-       }
-
-       if(vertical)
-               return eX * best_rows + eY * best_columns;
-       else
-               return eX * best_columns + eY * best_rows;
-}
-
-// return the string of the onscreen race timer
-string MakeRaceString(int cp, float mytime, float theirtime, float lapdelta, string theirname)
-{
-       string col;
-       string timestr;
-       string cpname;
-       string lapstr;
-       lapstr = "";
-
-       if(theirtime == 0) // goal hit
-       {
-               if(mytime > 0)
-               {
-                       timestr = strcat("+", ftos_decimals(+mytime, TIME_DECIMALS));
-                       col = "^1";
-               }
-               else if(mytime == 0)
-               {
-                       timestr = "+0.0";
-                       col = "^3";
-               }
-               else
-               {
-                       timestr = strcat("-", ftos_decimals(-mytime, TIME_DECIMALS));
-                       col = "^2";
-               }
-
-               if(lapdelta > 0)
-               {
-                       lapstr = sprintf(_(" (-%dL)"), lapdelta);
-                       col = "^2";
-               }
-               else if(lapdelta < 0)
-               {
-                       lapstr = sprintf(_(" (+%dL)"), -lapdelta);
-                       col = "^1";
-               }
-       }
-       else if(theirtime > 0) // anticipation
-       {
-               if(mytime >= theirtime)
-                       timestr = strcat("+", ftos_decimals(mytime - theirtime, TIME_DECIMALS));
-               else
-                       timestr = TIME_ENCODED_TOSTRING(TIME_ENCODE(theirtime));
-               col = "^3";
-       }
-       else
-       {
-               col = "^7";
-               timestr = "";
-       }
-
-       if(cp == 254)
-               cpname = _("Start line");
-       else if(cp == 255)
-               cpname = _("Finish line");
-       else if(cp)
-               cpname = sprintf(_("Intermediate %d"), cp);
-       else
-               cpname = _("Finish line");
-
-       if(theirtime < 0)
-               return strcat(col, cpname);
-       else if(theirname == "")
-               return strcat(col, sprintf("%s (%s)", cpname, timestr));
-       else
-               return strcat(col, sprintf("%s (%s %s)", cpname, timestr, strcat(theirname, col, lapstr)));
-}
-
-// Check if the given name already exist in race rankings? In that case, where? (otherwise return 0)
-int race_CheckName(string net_name)
-{
-       int i;
-       for (i=RANKINGS_CNT-1;i>=0;--i)
-               if(grecordholder[i] == net_name)
-                       return i+1;
-       return 0;
-}
-
-/*
-==================
-HUD panels
-==================
-*/
-
-//basically the same code of draw_ButtonPicture and draw_VertButtonPicture for the menu
-void HUD_Panel_DrawProgressBar(vector theOrigin, vector theSize, string pic, float length_ratio, bool vertical, float baralign, vector theColor, float theAlpha, int drawflag)
-{
-       if(!length_ratio || !theAlpha)
-               return;
-       if(length_ratio > 1)
-               length_ratio = 1;
-       if (baralign == 3)
-       {
-               if(length_ratio < -1)
-                       length_ratio = -1;
-       }
-       else if(length_ratio < 0)
-               return;
-
-       vector square;
-       vector width, height;
-       if(vertical) {
-               pic = strcat(hud_skin_path, "/", pic, "_vertical");
-               if(precache_pic(pic) == "") {
-                       pic = "gfx/hud/default/progressbar_vertical";
-               }
-
-        if (baralign == 1) // bottom align
-                       theOrigin.y += (1 - length_ratio) * theSize.y;
-        else if (baralign == 2) // center align
-            theOrigin.y += 0.5 * (1 - length_ratio) * theSize.y;
-        else if (baralign == 3) // center align, positive values down, negative up
-               {
-                       theSize.y *= 0.5;
-                       if (length_ratio > 0)
-                               theOrigin.y += theSize.y;
-                       else
-                       {
-                               theOrigin.y += (1 + length_ratio) * theSize.y;
-                               length_ratio = -length_ratio;
-                       }
-               }
-               theSize.y *= length_ratio;
-
-               vector bH;
-               width = eX * theSize.x;
-               height = eY * theSize.y;
-               if(theSize.y <= theSize.x * 2)
-               {
-                       // button not high enough
-                       // draw just upper and lower part then
-                       square = eY * theSize.y * 0.5;
-                       bH = eY * (0.25 * theSize.y / (theSize.x * 2));
-                       drawsubpic(theOrigin,          square + width, pic, '0 0 0', eX + bH, theColor, theAlpha, drawflag);
-                       drawsubpic(theOrigin + square, square + width, pic, eY - bH, eX + bH, theColor, theAlpha, drawflag);
-               }
-               else
-               {
-                       square = eY * theSize.x;
-                       drawsubpic(theOrigin,                   width   +     square, pic, '0 0    0', '1 0.25 0', theColor, theAlpha, drawflag);
-                       drawsubpic(theOrigin +          square, theSize - 2 * square, pic, '0 0.25 0', '1 0.5  0', theColor, theAlpha, drawflag);
-                       drawsubpic(theOrigin + height - square, width   +     square, pic, '0 0.75 0', '1 0.25 0', theColor, theAlpha, drawflag);
-               }
-       } else {
-               pic = strcat(hud_skin_path, "/", pic);
-               if(precache_pic(pic) == "") {
-                       pic = "gfx/hud/default/progressbar";
-               }
-
-               if (baralign == 1) // right align
-                       theOrigin.x += (1 - length_ratio) * theSize.x;
-        else if (baralign == 2) // center align
-            theOrigin.x += 0.5 * (1 - length_ratio) * theSize.x;
-        else if (baralign == 3) // center align, positive values on the right, negative on the left
-               {
-                       theSize.x *= 0.5;
-                       if (length_ratio > 0)
-                               theOrigin.x += theSize.x;
-                       else
-                       {
-                               theOrigin.x += (1 + length_ratio) * theSize.x;
-                               length_ratio = -length_ratio;
-                       }
-               }
-               theSize.x *= length_ratio;
-
-               vector bW;
-               width = eX * theSize.x;
-               height = eY * theSize.y;
-               if(theSize.x <= theSize.y * 2)
-               {
-                       // button not wide enough
-                       // draw just left and right part then
-                       square = eX * theSize.x * 0.5;
-                       bW = eX * (0.25 * theSize.x / (theSize.y * 2));
-                       drawsubpic(theOrigin,          square + height, pic, '0 0 0', eY + bW, theColor, theAlpha, drawflag);
-                       drawsubpic(theOrigin + square, square + height, pic, eX - bW, eY + bW, theColor, theAlpha, drawflag);
-               }
-               else
-               {
-                       square = eX * theSize.y;
-                       drawsubpic(theOrigin,                  height  +     square, pic, '0    0 0', '0.25 1 0', theColor, theAlpha, drawflag);
-                       drawsubpic(theOrigin +         square, theSize - 2 * square, pic, '0.25 0 0', '0.5  1 0', theColor, theAlpha, drawflag);
-                       drawsubpic(theOrigin + width - square, height  +     square, pic, '0.75 0 0', '0.25 1 0', theColor, theAlpha, drawflag);
-               }
-       }
-}
-
-void HUD_Panel_DrawHighlight(vector pos, vector mySize, vector color, float theAlpha, int drawflag)
-{
-       if(!theAlpha)
-               return;
-
-       string pic;
-       pic = strcat(hud_skin_path, "/num_leading");
-       if(precache_pic(pic) == "") {
-               pic = "gfx/hud/default/num_leading";
-       }
-
-       drawsubpic(pos, eX * min(mySize.x * 0.5, mySize.y) + eY * mySize.y, pic, '0 0 0', '0.25 1 0', color, theAlpha, drawflag);
-       if(mySize.x/mySize.y > 2)
-               drawsubpic(pos + eX * mySize.y, eX * (mySize.x - 2 * mySize.y) + eY * mySize.y, pic, '0.25 0 0', '0.5 1 0', color, theAlpha, drawflag);
-       drawsubpic(pos + eX * mySize.x - eX * min(mySize.x * 0.5, mySize.y), eX * min(mySize.x * 0.5, mySize.y) + eY * mySize.y, pic, '0.75 0 0', '0.25 1 0', color, theAlpha, drawflag);
-}
-
-// Weapon icons (#0)
-//
-entity weaponorder[Weapons_MAX];
-void weaponorder_swap(int i, int j, entity pass)
-{
-       entity h = weaponorder[i];
-       weaponorder[i] = weaponorder[j];
-       weaponorder[j] = h;
-}
-
-string weaponorder_cmp_str;
-int weaponorder_cmp(int i, int j, entity pass)
-{
-       int ai, aj;
-       ai = strstrofs(weaponorder_cmp_str, sprintf(" %d ", weaponorder[i].weapon), 0);
-       aj = strstrofs(weaponorder_cmp_str, sprintf(" %d ", weaponorder[j].weapon), 0);
-       return aj - ai; // the string is in REVERSE order (higher prio at the right is what we want, but higher prio first is the string)
-}
-
-void HUD_Weapons()
-{
-       SELFPARAM();
-       // declarations
-       WepSet weapons_stat = WepSet_GetFromStat();
-       int i;
-       float f, a;
-       float screen_ar;
-       vector center = '0 0 0';
-       int weapon_count, weapon_id;
-       int row, column, rows = 0, columns = 0;
-       bool vertical_order = true;
-       float aspect = autocvar_hud_panel_weapons_aspect;
-
-       float timeout = autocvar_hud_panel_weapons_timeout;
-       float timein_effect_length = autocvar_hud_panel_weapons_timeout_speed_in; //? 0.375 : 0);
-       float timeout_effect_length = autocvar_hud_panel_weapons_timeout_speed_out; //? 0.75 : 0);
-
-       vector barsize = '0 0 0', baroffset = '0 0 0';
-       vector ammo_color = '1 0 1';
-       float ammo_alpha = 1;
-
-       float when = max(1, autocvar_hud_panel_weapons_complainbubble_time);
-       float fadetime = max(0, autocvar_hud_panel_weapons_complainbubble_fadetime);
-
-       vector weapon_pos, weapon_size = '0 0 0';
-       vector color;
-
-       // check to see if we want to continue
-       if(hud != HUD_NORMAL) return;
-
-       if(!autocvar__hud_configure)
-       {
-               if((!autocvar_hud_panel_weapons) || (spectatee_status == -1))
-                       return;
-               if(timeout && time >= weapontime + timeout + timeout_effect_length)
-               if(autocvar_hud_panel_weapons_timeout_effect == 3 || (autocvar_hud_panel_weapons_timeout_effect == 1 && !(autocvar_hud_panel_weapons_timeout_fadebgmin + autocvar_hud_panel_weapons_timeout_fadefgmin)))
-               {
-                       weaponprevtime = time;
-                       return;
-               }
-       }
-
-       // update generic hud functions
-       HUD_Panel_UpdateCvars();
-
-       // figure out weapon order (how the weapons are sorted) // TODO make this configurable
-       if(weaponorder_bypriority != autocvar_cl_weaponpriority || !weaponorder[0])
-       {
-               int weapon_cnt;
-               if(weaponorder_bypriority)
-                       strunzone(weaponorder_bypriority);
-               if(weaponorder_byimpulse)
-                       strunzone(weaponorder_byimpulse);
-
-               weaponorder_bypriority = strzone(autocvar_cl_weaponpriority);
-               weaponorder_byimpulse = strzone(W_FixWeaponOrder_BuildImpulseList(W_FixWeaponOrder_ForceComplete(W_NumberWeaponOrder(weaponorder_bypriority))));
-               weaponorder_cmp_str = strcat(" ", weaponorder_byimpulse, " ");
-
-               weapon_cnt = 0;
-               for(i = WEP_FIRST; i <= WEP_LAST; ++i)
-               {
-                       setself(get_weaponinfo(i));
-                       if(self.impulse >= 0)
-                       {
-                               weaponorder[weapon_cnt] = self;
-                               ++weapon_cnt;
-                       }
-               }
-               for(i = weapon_cnt; i < Weapons_MAX; ++i)
-                       weaponorder[i] = world;
-               heapsort(weapon_cnt, weaponorder_swap, weaponorder_cmp, world);
-
-               weaponorder_cmp_str = string_null;
-       }
-
-       if(!autocvar_hud_panel_weapons_complainbubble || autocvar__hud_configure || time - complain_weapon_time >= when + fadetime)
-               complain_weapon = 0;
-
-       if(autocvar__hud_configure)
-       {
-               if(!weapons_stat)
-                       for(i = WEP_FIRST; i <= WEP_LAST; i += floor((WEP_LAST-WEP_FIRST)/5))
-                               weapons_stat |= WepSet_FromWeapon(i);
-
-               #if 0
-               /// debug code
-               if(cvar("wep_add"))
-               {
-                       weapons_stat = '0 0 0';
-                       float countw = 1 + floor((floor(time * cvar("wep_add"))) % (Weapons_COUNT - 1));
-                       for(i = WEP_FIRST; i <= countw; ++i)
-                               weapons_stat |= WepSet_FromWeapon(i);
-               }
-               #endif
-       }
-
-       // determine which weapons are going to be shown
-       if (autocvar_hud_panel_weapons_onlyowned)
-       {
-               if(autocvar__hud_configure)
-               {
-                       if(menu_enabled != 2)
-                               HUD_Panel_DrawBg(1); // also draw the bg of the entire panel
-               }
-
-               // do we own this weapon?
-               weapon_count = 0;
-               for(i = 0; i <= WEP_LAST-WEP_FIRST; ++i)
-                       if((weapons_stat & WepSet_FromWeapon(weaponorder[i].weapon)) || (weaponorder[i].weapon == complain_weapon))
-                               ++weapon_count;
-
-
-               // might as well commit suicide now, no reason to live ;)
-               if (weapon_count == 0)
-                       return;
-
-               vector old_panel_size = panel_size;
-               vector padded_panel_size = panel_size - '2 2 0' * panel_bg_padding;
-
-               // get the all-weapons layout
-               int nHidden = 0;
-               WepSet weapons_stat = WepSet_GetFromStat();
-               for (int i = WEP_FIRST; i <= WEP_LAST; ++i) {
-                       WepSet weapons_wep = WepSet_FromWeapon(i);
-                       if (weapons_stat & weapons_wep) continue;
-                       Weapon w = get_weaponinfo(i);
-                       if (w.spawnflags & WEP_FLAG_MUTATORBLOCKED) nHidden += 1;
-               }
-               vector table_size = HUD_GetTableSize_BestItemAR((Weapons_COUNT - 1) - nHidden, padded_panel_size, aspect);
-               columns = table_size.x;
-               rows = table_size.y;
-               weapon_size.x = padded_panel_size.x / columns;
-               weapon_size.y = padded_panel_size.y / rows;
-
-               // NOTE: although weapons should aways look the same even if onlyowned is enabled,
-               // we enlarge them a bit when possible to better match the desired aspect ratio
-               if(padded_panel_size.x / padded_panel_size.y < aspect)
-               {
-                       // maximum number of rows that allows to display items with the desired aspect ratio
-                       int max_rows = floor(padded_panel_size.y / (weapon_size.x / aspect));
-                       columns = min(columns, ceil(weapon_count / max_rows));
-                       rows = ceil(weapon_count / columns);
-                       weapon_size.y = min(padded_panel_size.y / rows, weapon_size.x / aspect);
-                       weapon_size.x = min(padded_panel_size.x / columns, aspect * weapon_size.y);
-                       vertical_order = false;
-               }
-               else
-               {
-                       int max_columns = floor(padded_panel_size.x / (weapon_size.y * aspect));
-                       rows = min(rows, ceil(weapon_count / max_columns));
-                       columns = ceil(weapon_count / rows);
-                       weapon_size.x = min(padded_panel_size.x / columns, aspect * weapon_size.y);
-                       weapon_size.y = min(padded_panel_size.y / rows, weapon_size.x / aspect);
-                       vertical_order = true;
-               }
-
-               // reduce size of the panel
-               panel_size.x = columns * weapon_size.x;
-               panel_size.y = rows * weapon_size.y;
-               panel_size += '2 2 0' * panel_bg_padding;
-
-               // center the resized panel, or snap it to the screen edge when close enough
-               if(panel_pos.x > vid_conwidth * 0.001)
-               {
-                       if(panel_pos.x + old_panel_size.x > vid_conwidth * 0.999)
-                               panel_pos.x += old_panel_size.x - panel_size.x;
-                       else
-                               panel_pos.x += (old_panel_size.x - panel_size.x) / 2;
-               }
-               else if(old_panel_size.x > vid_conwidth * 0.999)
-                       panel_pos.x += (old_panel_size.x - panel_size.x) / 2;
-
-               if(panel_pos.y > vid_conheight * 0.001)
-               {
-                       if(panel_pos.y + old_panel_size.y > vid_conheight * 0.999)
-                               panel_pos.y += old_panel_size.y - panel_size.y;
-                       else
-                               panel_pos.y += (old_panel_size.y - panel_size.y) / 2;
-               }
-               else if(old_panel_size.y > vid_conheight * 0.999)
-                       panel_pos.y += (old_panel_size.y - panel_size.y) / 2;
-       }
-       else
-               weapon_count = (Weapons_COUNT - 1);
-
-       // animation for fading in/out the panel respectively when not in use
-       if(!autocvar__hud_configure)
-       {
-               if (timeout && time >= weapontime + timeout) // apply timeout effect if needed
-               {
-                       f = bound(0, (time - (weapontime + timeout)) / timeout_effect_length, 1);
-
-                       // fade the panel alpha
-                       if(autocvar_hud_panel_weapons_timeout_effect == 1)
-                       {
-                               panel_bg_alpha *= (autocvar_hud_panel_weapons_timeout_fadebgmin * f + (1 - f));
-                               panel_fg_alpha *= (autocvar_hud_panel_weapons_timeout_fadefgmin * f + (1 - f));
-                       }
-                       else if(autocvar_hud_panel_weapons_timeout_effect == 3)
-                       {
-                               panel_bg_alpha *= (1 - f);
-                               panel_fg_alpha *= (1 - f);
-                       }
-
-                       // move the panel off the screen
-                       if (autocvar_hud_panel_weapons_timeout_effect == 2 || autocvar_hud_panel_weapons_timeout_effect == 3)
-                       {
-                               f *= f; // for a cooler movement
-                               center.x = panel_pos.x + panel_size.x/2;
-                               center.y = panel_pos.y + panel_size.y/2;
-                               screen_ar = vid_conwidth/vid_conheight;
-                               if (center.x/center.y < screen_ar) //bottom left
-                               {
-                                       if ((vid_conwidth - center.x)/center.y < screen_ar) //bottom
-                                               panel_pos.y += f * (vid_conheight - panel_pos.y);
-                                       else //left
-                                               panel_pos.x -= f * (panel_pos.x + panel_size.x);
-                               }
-                               else //top right
-                               {
-                                       if ((vid_conwidth - center.x)/center.y < screen_ar) //right
-                                               panel_pos.x += f * (vid_conwidth - panel_pos.x);
-                                       else //top
-                                               panel_pos.y -= f * (panel_pos.y + panel_size.y);
-                               }
-                               if(f == 1)
-                                       center.x = -1; // mark the panel as off screen
-                       }
-                       weaponprevtime = time - (1 - f) * timein_effect_length;
-               }
-               else if (timeout && time < weaponprevtime + timein_effect_length) // apply timein effect if needed
-               {
-                       f = bound(0, (time - weaponprevtime) / timein_effect_length, 1);
-
-                       // fade the panel alpha
-                       if(autocvar_hud_panel_weapons_timeout_effect == 1)
-                       {
-                               panel_bg_alpha *= (autocvar_hud_panel_weapons_timeout_fadebgmin * (1 - f) + f);
-                               panel_fg_alpha *= (autocvar_hud_panel_weapons_timeout_fadefgmin * (1 - f) + f);
-                       }
-                       else if(autocvar_hud_panel_weapons_timeout_effect == 3)
-                       {
-                               panel_bg_alpha *= (f);
-                               panel_fg_alpha *= (f);
-                       }
-
-                       // move the panel back on screen
-                       if (autocvar_hud_panel_weapons_timeout_effect == 2 || autocvar_hud_panel_weapons_timeout_effect == 3)
-                       {
-                               f *= f; // for a cooler movement
-                               f = 1 - f;
-                               center.x = panel_pos.x + panel_size.x/2;
-                               center.y = panel_pos.y + panel_size.y/2;
-                               screen_ar = vid_conwidth/vid_conheight;
-                               if (center.x/center.y < screen_ar) //bottom left
-                               {
-                                       if ((vid_conwidth - center.x)/center.y < screen_ar) //bottom
-                                               panel_pos.y += f * (vid_conheight - panel_pos.y);
-                                       else //left
-                                               panel_pos.x -= f * (panel_pos.x + panel_size.x);
-                               }
-                               else //top right
-                               {
-                                       if ((vid_conwidth - center.x)/center.y < screen_ar) //right
-                                               panel_pos.x += f * (vid_conwidth - panel_pos.x);
-                                       else //top
-                                               panel_pos.y -= f * (panel_pos.y + panel_size.y);
-                               }
-                       }
-               }
-       }
-
-       // draw the background, then change the virtual size of it to better fit other items inside
-       HUD_Panel_DrawBg(1);
-
-       if(center.x == -1)
-               return;
-
-       if(panel_bg_padding)
-       {
-               panel_pos += '1 1 0' * panel_bg_padding;
-               panel_size -= '2 2 0' * panel_bg_padding;
-       }
-
-       // after the sizing and animations are done, update the other values
-
-       if(!rows) // if rows is > 0 onlyowned code has already updated these vars
-       {
-               vector table_size = HUD_GetTableSize_BestItemAR((Weapons_COUNT - 1), panel_size, aspect);
-               columns = table_size.x;
-               rows = table_size.y;
-               weapon_size.x = panel_size.x / columns;
-               weapon_size.y = panel_size.y / rows;
-               vertical_order = (panel_size.x / panel_size.y >= aspect);
-       }
-
-       // calculate position/size for visual bar displaying ammount of ammo status
-       if (autocvar_hud_panel_weapons_ammo)
-       {
-               ammo_color = stov(autocvar_hud_panel_weapons_ammo_color);
-               ammo_alpha = panel_fg_alpha * autocvar_hud_panel_weapons_ammo_alpha;
-
-               if(weapon_size.x/weapon_size.y > aspect)
-               {
-                       barsize.x = aspect * weapon_size.y;
-                       barsize.y = weapon_size.y;
-                       baroffset.x = (weapon_size.x - barsize.x) / 2;
-               }
-               else
-               {
-                       barsize.y = 1/aspect * weapon_size.x;
-                       barsize.x = weapon_size.x;
-                       baroffset.y = (weapon_size.y - barsize.y) / 2;
-               }
-       }
-       if(autocvar_hud_panel_weapons_accuracy)
-               Accuracy_LoadColors();
-
-       // draw items
-       row = column = 0;
-       vector label_size = '1 1 0' * min(weapon_size.x, weapon_size.y) * bound(0, autocvar_hud_panel_weapons_label_scale, 1);
-       vector noncurrent_pos = '0 0 0';
-       vector noncurrent_size = weapon_size * bound(0, autocvar_hud_panel_weapons_noncurrent_scale, 1);
-       float noncurrent_alpha = panel_fg_alpha * bound(0, autocvar_hud_panel_weapons_noncurrent_alpha, 1);
-       bool isCurrent;
-
-       for(i = 0; i <= WEP_LAST-WEP_FIRST; ++i)
-       {
-               // retrieve information about the current weapon to be drawn
-               setself(weaponorder[i]);
-               weapon_id = self.impulse;
-               isCurrent = (self.weapon == switchweapon);
-
-               // skip if this weapon doesn't exist
-               if(!self || weapon_id < 0) { continue; }
-
-               // skip this weapon if we don't own it (and onlyowned is enabled)-- or if weapons_complainbubble is showing for this weapon
-               if(autocvar_hud_panel_weapons_onlyowned)
-               if (!((weapons_stat & WepSet_FromWeapon(self.weapon)) || (self.weapon == complain_weapon)))
-                       continue;
-
-               // figure out the drawing position of weapon
-               weapon_pos = (panel_pos + eX * column * weapon_size.x + eY * row * weapon_size.y);
-               noncurrent_pos.x = weapon_pos.x + (weapon_size.x - noncurrent_size.x) / 2;
-               noncurrent_pos.y = weapon_pos.y + (weapon_size.y - noncurrent_size.y) / 2;
-
-               // draw background behind currently selected weapon
-               if(isCurrent)
-                       drawpic_aspect_skin(weapon_pos, "weapon_current_bg", weapon_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-
-               // draw the weapon accuracy
-               if(autocvar_hud_panel_weapons_accuracy)
-               {
-                       float panel_weapon_accuracy = weapon_accuracy[self.weapon-WEP_FIRST];
-                       if(panel_weapon_accuracy >= 0)
-                       {
-                               color = Accuracy_GetColor(panel_weapon_accuracy);
-                               drawpic_aspect_skin(weapon_pos, "weapon_accuracy", weapon_size, color, panel_fg_alpha, DRAWFLAG_NORMAL);
-                       }
-               }
-
-               // drawing all the weapon items
-               if(weapons_stat & WepSet_FromWeapon(self.weapon))
-               {
-                       // draw the weapon image
-                       if(isCurrent)
-                               drawpic_aspect_skin(weapon_pos, self.model2, weapon_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-                       else
-                               drawpic_aspect_skin(noncurrent_pos, self.model2, noncurrent_size, '1 1 1', noncurrent_alpha, DRAWFLAG_NORMAL);
-
-                       // draw weapon label string
-                       switch(autocvar_hud_panel_weapons_label)
-                       {
-                               case 1: // weapon number
-                                       drawstring(weapon_pos, ftos(weapon_id), label_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-                                       break;
-
-                               case 2: // bind
-                                       drawstring(weapon_pos, getcommandkey(ftos(weapon_id), strcat("weapon_group_", ftos(weapon_id))), label_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-                                       break;
-
-                               case 3: // weapon name
-                                       drawstring(weapon_pos, strtolower(self.m_name), label_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-                                       break;
-
-                               default: // nothing
-                                       break;
-                       }
-
-                       // draw ammo status bar
-                       if(autocvar_hud_panel_weapons_ammo && (self.ammo_field != ammo_none))
-                       {
-                               float ammo_full;
-                               a = getstati(GetAmmoStat(self.ammo_field)); // how much ammo do we have?
-
-                               if(a > 0)
-                               {
-                                       switch(self.ammo_field)
-                                       {
-                                               case ammo_shells:  ammo_full = autocvar_hud_panel_weapons_ammo_full_shells;  break;
-                                               case ammo_nails:   ammo_full = autocvar_hud_panel_weapons_ammo_full_nails;   break;
-                                               case ammo_rockets: ammo_full = autocvar_hud_panel_weapons_ammo_full_rockets; break;
-                                               case ammo_cells:   ammo_full = autocvar_hud_panel_weapons_ammo_full_cells;   break;
-                                               case ammo_plasma:  ammo_full = autocvar_hud_panel_weapons_ammo_full_plasma;  break;
-                                               case ammo_fuel:    ammo_full = autocvar_hud_panel_weapons_ammo_full_fuel;    break;
-                                               default: ammo_full = 60;
-                                       }
-
-                                       drawsetcliparea(
-                                               weapon_pos.x + baroffset.x,
-                                               weapon_pos.y + baroffset.y,
-                                               barsize.x * bound(0, a/ammo_full, 1),
-                                               barsize.y
-                                       );
-
-                                       drawpic_aspect_skin(
-                                               weapon_pos,
-                                               "weapon_ammo",
-                                               weapon_size,
-                                               ammo_color,
-                                               ammo_alpha,
-                                               DRAWFLAG_NORMAL
-                                       );
-
-                                       drawresetcliparea();
-                               }
-                       }
-               }
-               else // draw a "ghost weapon icon" if you don't have the weapon
-               {
-                       drawpic_aspect_skin(noncurrent_pos, self.model2, noncurrent_size, '0.2 0.2 0.2', panel_fg_alpha * 0.5, DRAWFLAG_NORMAL);
-               }
-
-               // draw the complain message
-               if(self.weapon == complain_weapon)
-               {
-                       if(fadetime)
-                               a = ((complain_weapon_time + when > time) ? 1 : bound(0, (complain_weapon_time + when + fadetime - time) / fadetime, 1));
-                       else
-                               a = ((complain_weapon_time + when > time) ? 1 : 0);
-
-                       string s;
-                       if(complain_weapon_type == 0) {
-                               s = _("Out of ammo");
-                               color = stov(autocvar_hud_panel_weapons_complainbubble_color_outofammo);
-                       }
-                       else if(complain_weapon_type == 1) {
-                               s = _("Don't have");
-                               color = stov(autocvar_hud_panel_weapons_complainbubble_color_donthave);
-                       }
-                       else {
-                               s = _("Unavailable");
-                               color = stov(autocvar_hud_panel_weapons_complainbubble_color_unavailable);
-                       }
-                       float padding = autocvar_hud_panel_weapons_complainbubble_padding;
-                       drawpic_aspect_skin(weapon_pos + '1 1 0' * padding, "weapon_complainbubble", weapon_size - '2 2 0' * padding, color, a * panel_fg_alpha, DRAWFLAG_NORMAL);
-                       drawstring_aspect(weapon_pos + '1 1 0' * padding, s, weapon_size - '2 2 0' * padding, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
-               }
-
-               #if 0
-               /// debug code
-               if(!autocvar_hud_panel_weapons_onlyowned)
-               {
-                       drawfill(weapon_pos + '1 1 0', weapon_size - '2 2 0', '1 1 1', panel_fg_alpha * 0.2, DRAWFLAG_NORMAL);
-                       drawstring(weapon_pos, ftos(i + 1), label_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-               }
-               #endif
-
-               // continue with new position for the next weapon
-               if(vertical_order)
-               {
-                       ++column;
-                       if(column >= columns)
-                       {
-                               column = 0;
-                               ++row;
-                       }
-               }
-               else
-               {
-                       ++row;
-                       if(row >= rows)
-                       {
-                               row = 0;
-                               ++column;
-                       }
-               }
-       }
-}
-
-// Ammo (#1)
-void DrawNadeProgressBar(vector myPos, vector mySize, float progress, vector color)
-{
-       HUD_Panel_DrawProgressBar(
-               myPos + eX * autocvar_hud_panel_ammo_progressbar_xoffset * mySize.x,
-               mySize - eX * autocvar_hud_panel_ammo_progressbar_xoffset * mySize.x,
-               autocvar_hud_panel_ammo_progressbar_name,
-               progress, 0, 0, color,
-               autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
-}
-
-void DrawAmmoNades(vector myPos, vector mySize, bool draw_expanding, float expand_time)
-{
-       float bonusNades    = getstatf(STAT_NADE_BONUS);
-       float bonusProgress = getstatf(STAT_NADE_BONUS_SCORE);
-       float bonusType     = getstati(STAT_NADE_BONUS_TYPE);
-       Nade def = Nades_from(bonusType);
-       vector nadeColor    = def.m_color;
-       string nadeIcon     = def.m_icon;
-
-       vector iconPos, textPos;
-
-       if(autocvar_hud_panel_ammo_iconalign)
-       {
-               iconPos = myPos + eX * 2 * mySize.y;
-               textPos = myPos;
-       }
-       else
-       {
-               iconPos = myPos;
-               textPos = myPos + eX * mySize.y;
-       }
-
-       if(bonusNades > 0 || bonusProgress > 0)
-       {
-               DrawNadeProgressBar(myPos, mySize, bonusProgress, nadeColor);
-
-               if(autocvar_hud_panel_ammo_text)
-                       drawstring_aspect(textPos, ftos(bonusNades), eX * (2/3) * mySize.x + eY * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-
-               if(draw_expanding)
-                       drawpic_aspect_skin_expanding(iconPos, nadeIcon, '1 1 0' * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, expand_time);
-
-               drawpic_aspect_skin(iconPos, nadeIcon, '1 1 0' * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-       }
-}
-
-void DrawAmmoItem(vector myPos, vector mySize, .int ammoType, bool isCurrent, bool isInfinite)
-{
-       if(ammoType == ammo_none)
-               return;
-
-       // Initialize variables
-
-       int ammo;
-       if(autocvar__hud_configure)
-       {
-               isCurrent = (ammoType == ammo_rockets); // Rockets always current
-               ammo = 60;
-       }
-       else
-               ammo = getstati(GetAmmoStat(ammoType));
-
-       if(!isCurrent)
-       {
-               float scale = bound(0, autocvar_hud_panel_ammo_noncurrent_scale, 1);
-               myPos = myPos + (mySize - mySize * scale) * 0.5;
-               mySize = mySize * scale;
-       }
-
-       vector iconPos, textPos;
-       if(autocvar_hud_panel_ammo_iconalign)
-       {
-               iconPos = myPos + eX * 2 * mySize.y;
-               textPos = myPos;
-       }
-       else
-       {
-               iconPos = myPos;
-               textPos = myPos + eX * mySize.y;
-       }
-
-       bool isShadowed = (ammo <= 0 && !isCurrent && !isInfinite);
-
-       vector iconColor = isShadowed ? '0 0 0' : '1 1 1';
-       vector textColor;
-       if(isInfinite)
-               textColor = '0.2 0.95 0';
-       else if(isShadowed)
-               textColor = '0 0 0';
-       else if(ammo < 10)
-               textColor = '0.8 0.04 0';
-       else
-               textColor = '1 1 1';
-
-       float alpha;
-       if(isCurrent)
-               alpha = panel_fg_alpha;
-       else if(isShadowed)
-               alpha = panel_fg_alpha * bound(0, autocvar_hud_panel_ammo_noncurrent_alpha, 1) * 0.5;
-       else
-               alpha = panel_fg_alpha * bound(0, autocvar_hud_panel_ammo_noncurrent_alpha, 1);
-
-       string text = isInfinite ? "\xE2\x88\x9E" : ftos(ammo); // Use infinity symbol (U+221E)
-
-       // Draw item
-
-       if(isCurrent)
-               drawpic_aspect_skin(myPos, "ammo_current_bg", mySize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-
-       if(ammo > 0 && autocvar_hud_panel_ammo_progressbar)
-               HUD_Panel_DrawProgressBar(myPos + eX * autocvar_hud_panel_ammo_progressbar_xoffset * mySize.x, mySize - eX * autocvar_hud_panel_ammo_progressbar_xoffset * mySize.x, autocvar_hud_panel_ammo_progressbar_name, ammo/autocvar_hud_panel_ammo_maxammo, 0, 0, textColor, autocvar_hud_progressbar_alpha * alpha, DRAWFLAG_NORMAL);
-
-       if(autocvar_hud_panel_ammo_text)
-               drawstring_aspect(textPos, text, eX * (2/3) * mySize.x + eY * mySize.y, textColor, alpha, DRAWFLAG_NORMAL);
-
-       drawpic_aspect_skin(iconPos, GetAmmoPicture(ammoType), '1 1 0' * mySize.y, iconColor, alpha, DRAWFLAG_NORMAL);
-}
-
-int nade_prevstatus;
-int nade_prevframe;
-float nade_statuschange_time;
-void HUD_Ammo()
-{
-       if(hud != HUD_NORMAL) return;
-       if(!autocvar__hud_configure)
-       {
-               if(!autocvar_hud_panel_ammo) return;
-               if(spectatee_status == -1) return;
-       }
-
-       HUD_Panel_UpdateCvars();
-
-       draw_beginBoldFont();
-
-       vector pos, mySize;
-       pos = panel_pos;
-       mySize = panel_size;
-
-       HUD_Panel_DrawBg(1);
-       if(panel_bg_padding)
-       {
-               pos += '1 1 0' * panel_bg_padding;
-               mySize -= '2 2 0' * panel_bg_padding;
-       }
-
-       int rows = 0, columns, row, column;
-       float nade_cnt = getstatf(STAT_NADE_BONUS), nade_score = getstatf(STAT_NADE_BONUS_SCORE);
-       bool draw_nades = (nade_cnt > 0 || nade_score > 0);
-       float nade_statuschange_elapsedtime;
-       int total_ammo_count;
-
-       vector ammo_size;
-       if (autocvar_hud_panel_ammo_onlycurrent)
-               total_ammo_count = 1;
-       else
-               total_ammo_count = AMMO_COUNT;
-
-       if(draw_nades)
-       {
-               ++total_ammo_count;
-               if (nade_cnt != nade_prevframe)
-               {
-                       nade_statuschange_time = time;
-                       nade_prevstatus = nade_prevframe;
-                       nade_prevframe = nade_cnt;
-               }
-       }
-       else
-               nade_prevstatus = nade_prevframe = nade_statuschange_time = 0;
-
-       rows = HUD_GetRowCount(total_ammo_count, mySize, 3);
-       columns = ceil((total_ammo_count)/rows);
-       ammo_size = eX * mySize.x*(1/columns) + eY * mySize.y*(1/rows);
-
-       vector offset = '0 0 0'; // fteqcc sucks
-       float newSize;
-       if(ammo_size.x/ammo_size.y > 3)
-       {
-               newSize = 3 * ammo_size.y;
-               offset.x = ammo_size.x - newSize;
-               pos.x += offset.x/2;
-               ammo_size.x = newSize;
-       }
-       else
-       {
-               newSize = 1/3 * ammo_size.x;
-               offset.y = ammo_size.y - newSize;
-               pos.y += offset.y/2;
-               ammo_size.y = newSize;
-       }
-
-       int i;
-       bool infinite_ammo = (getstati(STAT_ITEMS, 0, 24) & IT_UNLIMITED_WEAPON_AMMO);
-       row = column = 0;
-       if(autocvar_hud_panel_ammo_onlycurrent)
-       {
-               if(autocvar__hud_configure)
-               {
-                       DrawAmmoItem(pos, ammo_size, ammo_rockets, true, false);
-               }
-               else
-               {
-                       DrawAmmoItem(
-                               pos,
-                               ammo_size,
-                               (get_weaponinfo(switchweapon)).ammo_field,
-                               true,
-                               infinite_ammo
-                       );
-               }
-
-               ++row;
-               if(row >= rows)
-               {
-                       row = 0;
-                       column = column + 1;
-               }
-       }
-       else
-       {
-               .int ammotype;
-               row = column = 0;
-               for(i = 0; i < AMMO_COUNT; ++i)
-               {
-                       ammotype = GetAmmoFieldFromNum(i);
-                       DrawAmmoItem(
-                               pos + eX * column * (ammo_size.x + offset.x) + eY * row * (ammo_size.y + offset.y),
-                               ammo_size,
-                               ammotype,
-                               ((get_weaponinfo(switchweapon)).ammo_field == ammotype),
-                               infinite_ammo
-                       );
-
-                       ++row;
-                       if(row >= rows)
-                       {
-                               row = 0;
-                               column = column + 1;
-                       }
-               }
-       }
-
-       if (draw_nades)
-       {
-               nade_statuschange_elapsedtime = time - nade_statuschange_time;
-
-               float f = bound(0, nade_statuschange_elapsedtime*2, 1);
-
-               DrawAmmoNades(pos + eX * column * (ammo_size.x + offset.x) + eY * row * (ammo_size.y + offset.y), ammo_size, nade_prevstatus < nade_cnt && nade_cnt != 0 && f < 1, f);
-       }
-
-       draw_endBoldFont();
-}
-
-void DrawNumIcon_expanding(vector myPos, vector mySize, float x, string icon, bool vertical, bool icon_right_align, vector color, float theAlpha, float fadelerp)
-{
-       vector newPos = '0 0 0', newSize = '0 0 0';
-       vector picpos, numpos;
-
-       if (vertical)
-       {
-               if(mySize.y/mySize.x > 2)
-               {
-                       newSize.y = 2 * mySize.x;
-                       newSize.x = mySize.x;
-
-                       newPos.y = myPos.y + (mySize.y - newSize.y) / 2;
-                       newPos.x = myPos.x;
-               }
-               else
-               {
-                       newSize.x = 1/2 * mySize.y;
-                       newSize.y = mySize.y;
-
-                       newPos.x = myPos.x + (mySize.x - newSize.x) / 2;
-                       newPos.y = myPos.y;
-               }
-
-               if(icon_right_align)
-               {
-                       numpos = newPos;
-                       picpos = newPos + eY * newSize.x;
-               }
-               else
-               {
-                       picpos = newPos;
-                       numpos = newPos + eY * newSize.x;
-               }
-
-               newSize.y /= 2;
-               drawpic_aspect_skin(picpos, icon, newSize, '1 1 1', panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL);
-               // make number smaller than icon, it looks better
-               // reduce only y to draw numbers with different number of digits with the same y size
-               numpos.y += newSize.y * ((1 - 0.7) / 2);
-               newSize.y *= 0.7;
-               drawstring_aspect(numpos, ftos(x), newSize, color, panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL);
-               return;
-       }
-
-       if(mySize.x/mySize.y > 3)
-       {
-               newSize.x = 3 * mySize.y;
-               newSize.y = mySize.y;
-
-               newPos.x = myPos.x + (mySize.x - newSize.x) / 2;
-               newPos.y = myPos.y;
-       }
-       else
-       {
-               newSize.y = 1/3 * mySize.x;
-               newSize.x = mySize.x;
-
-               newPos.y = myPos.y + (mySize.y - newSize.y) / 2;
-               newPos.x = myPos.x;
-       }
-
-       if(icon_right_align) // right align
-       {
-               numpos = newPos;
-               picpos = newPos + eX * 2 * newSize.y;
-       }
-       else // left align
-       {
-               numpos = newPos + eX * newSize.y;
-               picpos = newPos;
-       }
-
-       // NOTE: newSize_x is always equal to 3 * mySize_y so we can use
-       // '2 1 0' * newSize_y instead of eX * (2/3) * newSize_x + eY * newSize_y
-       drawstring_aspect_expanding(numpos, ftos(x), '2 1 0' * newSize.y, color, panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL, fadelerp);
-       drawpic_aspect_skin_expanding(picpos, icon, '1 1 0' * newSize.y, '1 1 1', panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL, fadelerp);
-}
-
-void DrawNumIcon(vector myPos, vector mySize, float x, string icon, bool vertical, bool icon_right_align, vector color, float theAlpha)
-{
-       DrawNumIcon_expanding(myPos, mySize, x, icon, vertical, icon_right_align, color, theAlpha, 0);
-}
-
-// Powerups (#2)
-//
-
-// Powerup item fields (reusing existing fields)
-.string message;  // Human readable name
-.string netname;  // Icon name
-.vector colormod; // Color
-.float count;     // Time left
-.float lifetime;  // Maximum time
-
-entity powerupItems;
-int powerupItemsCount;
-
-void resetPowerupItems()
-{
-       entity item;
-       for(item = powerupItems; item; item = item.chain)
-               item.count = 0;
-
-       powerupItemsCount = 0;
-}
-
-void addPowerupItem(string name, string icon, vector color, float currentTime, float lifeTime)
-{
-       if(!powerupItems)
-               powerupItems = spawn();
-
-       entity item;
-       for(item = powerupItems; item.count; item = item.chain)
-               if(!item.chain)
-                       item.chain = spawn();
-
-       item.message  = name;
-       item.netname  = icon;
-       item.colormod = color;
-       item.count    = currentTime;
-       item.lifetime = lifeTime;
-
-       ++powerupItemsCount;
-}
-
-int getPowerupItemAlign(int align, int column, int row, int columns, int rows, bool isVertical)
-{
-       if(align < 2)
-               return align;
-
-       bool isTop    =  isVertical && rows > 1 && row == 0;
-       bool isBottom =  isVertical && rows > 1 && row == rows-1;
-       bool isLeft   = !isVertical && columns > 1 && column == 0;
-       bool isRight  = !isVertical && columns > 1 && column == columns-1;
-
-       if(isTop    || isLeft)  return (align == 2) ? 1 : 0;
-       if(isBottom || isRight) return (align == 2) ? 0 : 1;
-
-       return 2;
-}
-
-void HUD_Powerups()
-{
-       int allItems = getstati(STAT_ITEMS, 0, 24);
-       int allBuffs = getstati(STAT_BUFFS, 0, 24);
-       int strengthTime, shieldTime, superTime;
-
-       // Initialize items
-       if(!autocvar__hud_configure)
-       {
-               if(!autocvar_hud_panel_powerups) return;
-               if(spectatee_status == -1) return;
-               if(getstati(STAT_HEALTH) <= 0) return;
-               if(!(allItems & (ITEM_Strength.m_itemid | ITEM_Shield.m_itemid | IT_SUPERWEAPON)) && !allBuffs) return;
-
-               strengthTime = bound(0, getstatf(STAT_STRENGTH_FINISHED) - time, 99);
-               shieldTime = bound(0, getstatf(STAT_INVINCIBLE_FINISHED) - time, 99);
-               superTime = bound(0, getstatf(STAT_SUPERWEAPONS_FINISHED) - time, 99);
-
-               if(allItems & IT_UNLIMITED_SUPERWEAPONS)
-                       superTime = 99;
-
-               // Prevent stuff to show up on mismatch that will be fixed next frame
-               if(!(allItems & IT_SUPERWEAPON))
-                       superTime = 0;
-       }
-       else
-       {
-               strengthTime = 15;
-               shieldTime = 27;
-               superTime = 13;
-               allBuffs = 0;
-       }
-
-       // Add items to linked list
-       resetPowerupItems();
-
-       if(strengthTime)
-               addPowerupItem("Strength", "strength", autocvar_hud_progressbar_strength_color, strengthTime, 30);
-       if(shieldTime)
-               addPowerupItem("Shield", "shield", autocvar_hud_progressbar_shield_color, shieldTime, 30);
-       if(superTime)
-               addPowerupItem("Superweapons", "superweapons", autocvar_hud_progressbar_superweapons_color, superTime, 30);
-
-       FOREACH(Buffs, it.m_itemid & allBuffs, LAMBDA(
-               addPowerupItem(it.m_prettyName, strcat("buff_", it.m_name), it.m_color, bound(0, getstatf(STAT_BUFF_TIME) - time, 99), 60);
-       ));
-
-       if(!powerupItemsCount)
-               return;
-
-       // Draw panel background
-       HUD_Panel_UpdateCvars();
-       HUD_Panel_DrawBg(1);
-
-       // Set drawing area
-       vector pos = panel_pos;
-       vector size = panel_size;
-       bool isVertical = size.y > size.x;
-
-       if(panel_bg_padding)
-       {
-               pos += '1 1 0' * panel_bg_padding;
-               size -= '2 2 0' * panel_bg_padding;
-       }
-
-       // Find best partitioning of the drawing area
-       const float DESIRED_ASPECT = 6;
-       float aspect = 0, a;
-       int columns = 0, c;
-       int rows = 0, r;
-       int i = 1;
-
-       do
-       {
-               c = floor(powerupItemsCount / i);
-               r = ceil(powerupItemsCount / c);
-               a = isVertical ? (size.y/r) / (size.x/c) : (size.x/c) / (size.y/r);
-
-               if(i == 1 || fabs(DESIRED_ASPECT - a) < fabs(DESIRED_ASPECT - aspect))
-               {
-                       aspect = a;
-                       columns = c;
-                       rows = r;
-               }
-       }
-       while(++i <= powerupItemsCount);
-
-       // Prevent single items from getting too wide
-       if(powerupItemsCount == 1 && aspect > DESIRED_ASPECT)
-       {
-               if(isVertical)
-               {
-                       size.y *= 0.5;
-                       pos.y += size.y * 0.5;
-               }
-               else
-               {
-                       size.x *= 0.5;
-                       pos.x += size.x * 0.5;
-               }
-       }
-
-       // Draw items from linked list
-       vector itemPos = pos;
-       vector itemSize = eX * (size.x / columns) + eY * (size.y / rows);
-       vector textColor = '1 1 1';
-
-       int fullSeconds = 0;
-       int align = 0;
-       int column = 0;
-       int row = 0;
-
-       draw_beginBoldFont();
-       for(entity item = powerupItems; item.count; item = item.chain)
-       {
-               itemPos = eX * (pos.x + column * itemSize.x) + eY * (pos.y + row * itemSize.y);
-
-               // Draw progressbar
-               if(autocvar_hud_panel_powerups_progressbar)
-               {
-                       align = getPowerupItemAlign(autocvar_hud_panel_powerups_baralign, column, row, columns, rows, isVertical);
-                       HUD_Panel_DrawProgressBar(itemPos, itemSize, "progressbar", item.count / item.lifetime, isVertical, align, item.colormod, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
-               }
-
-               // Draw icon and text
-               if(autocvar_hud_panel_powerups_text)
-               {
-                       align = getPowerupItemAlign(autocvar_hud_panel_powerups_iconalign, column, row, columns, rows, isVertical);
-                       fullSeconds = ceil(item.count);
-                       textColor = '0.6 0.6 0.6' + (item.colormod * 0.4);
-
-                       if(item.count > 1)
-                               DrawNumIcon(itemPos, itemSize, fullSeconds, item.netname, isVertical, align, textColor, panel_fg_alpha);
-                       if(item.count <= 5)
-                               DrawNumIcon_expanding(itemPos, itemSize, fullSeconds, item.netname, isVertical, align, textColor, panel_fg_alpha, bound(0, (fullSeconds - item.count) / 0.5, 1));
-               }
-
-               // Determine next section
-               if(isVertical)
-               {
-                       if(++column >= columns)
-                       {
-                               column = 0;
-                               ++row;
-                       }
-               }
-               else
-               {
-                       if(++row >= rows)
-                       {
-                               row = 0;
-                               ++column;
-                       }
-               }
-       }
-       draw_endBoldFont();
-}
-
-// Health/armor (#3)
-//
-
-
-void HUD_HealthArmor()
-{
-       int armor, health, fuel;
-       if(!autocvar__hud_configure)
-       {
-               if(!autocvar_hud_panel_healtharmor) return;
-               if(hud != HUD_NORMAL) return;
-               if(spectatee_status == -1) return;
-
-               health = getstati(STAT_HEALTH);
-               if(health <= 0)
-               {
-                       prev_health = -1;
-                       return;
-               }
-               armor = getstati(STAT_ARMOR);
-
-               // code to check for spectatee_status changes is in Ent_ClientData()
-               // prev_p_health and prev_health can be set to -1 there
-
-               if (prev_p_health == -1)
-               {
-                       // no effect
-                       health_beforedamage = 0;
-                       armor_beforedamage = 0;
-                       health_damagetime = 0;
-                       armor_damagetime = 0;
-                       prev_health = health;
-                       prev_armor = armor;
-                       old_p_health = health;
-                       old_p_armor = armor;
-                       prev_p_health = health;
-                       prev_p_armor = armor;
-               }
-               else if (prev_health == -1)
-               {
-                       //start the load effect
-                       health_damagetime = 0;
-                       armor_damagetime = 0;
-                       prev_health = 0;
-                       prev_armor = 0;
-               }
-               fuel = getstati(STAT_FUEL);
-       }
-       else
-       {
-               health = 150;
-               armor = 75;
-               fuel = 20;
-       }
-
-       HUD_Panel_UpdateCvars();
-
-       draw_beginBoldFont();
-
-       vector pos, mySize;
-       pos = panel_pos;
-       mySize = panel_size;
-
-       HUD_Panel_DrawBg(1);
-       if(panel_bg_padding)
-       {
-               pos += '1 1 0' * panel_bg_padding;
-               mySize -= '2 2 0' * panel_bg_padding;
-       }
-
-       int baralign = autocvar_hud_panel_healtharmor_baralign;
-       int iconalign = autocvar_hud_panel_healtharmor_iconalign;
-
-    int maxhealth = autocvar_hud_panel_healtharmor_maxhealth;
-    int maxarmor = autocvar_hud_panel_healtharmor_maxarmor;
-       if(autocvar_hud_panel_healtharmor == 2) // combined health and armor display
-       {
-               vector v;
-               v = healtharmor_maxdamage(health, armor, armorblockpercent, DEATH_WEAPON.m_id);
-
-               float x;
-               x = floor(v.x + 1);
-
-        float maxtotal = maxhealth + maxarmor;
-               string biggercount;
-               if(v.z) // NOT fully armored
-               {
-                       biggercount = "health";
-                       if(autocvar_hud_panel_healtharmor_progressbar)
-                               HUD_Panel_DrawProgressBar(pos, mySize, autocvar_hud_panel_healtharmor_progressbar_health, x/maxtotal, 0, (baralign == 1 || baralign == 2), autocvar_hud_progressbar_health_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
-                       if(armor)
-            if(autocvar_hud_panel_healtharmor_text)
-                               drawpic_aspect_skin(pos + eX * mySize.x - eX * 0.5 * mySize.y, "armor", '0.5 0.5 0' * mySize.y, '1 1 1', panel_fg_alpha * armor / health, DRAWFLAG_NORMAL);
-               }
-               else
-               {
-                       biggercount = "armor";
-                       if(autocvar_hud_panel_healtharmor_progressbar)
-                               HUD_Panel_DrawProgressBar(pos, mySize, autocvar_hud_panel_healtharmor_progressbar_armor, x/maxtotal, 0, (baralign == 1 || baralign == 2), autocvar_hud_progressbar_armor_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
-                       if(health)
-            if(autocvar_hud_panel_healtharmor_text)
-                               drawpic_aspect_skin(pos + eX * mySize.x - eX * 0.5 * mySize.y, "health", '0.5 0.5 0' * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-               }
-        if(autocvar_hud_panel_healtharmor_text)
-                       DrawNumIcon(pos, mySize, x, biggercount, 0, iconalign, HUD_Get_Num_Color(x, maxtotal), 1);
-
-               if(fuel)
-                       HUD_Panel_DrawProgressBar(pos, eX * mySize.x + eY * 0.2 * mySize.y, "progressbar", fuel/100, 0, (baralign == 1 || baralign == 3), autocvar_hud_progressbar_fuel_color, panel_fg_alpha * 0.8, DRAWFLAG_NORMAL);
-       }
-       else
-       {
-               float panel_ar = mySize.x/mySize.y;
-               bool is_vertical = (panel_ar < 1);
-               vector health_offset = '0 0 0', armor_offset = '0 0 0';
-               if (panel_ar >= 4 || (panel_ar >= 1/4 && panel_ar < 1))
-               {
-                       mySize.x *= 0.5;
-                       if (autocvar_hud_panel_healtharmor_flip)
-                               health_offset.x = mySize.x;
-                       else
-                               armor_offset.x = mySize.x;
-               }
-               else
-               {
-                       mySize.y *= 0.5;
-                       if (autocvar_hud_panel_healtharmor_flip)
-                               health_offset.y = mySize.y;
-                       else
-                               armor_offset.y = mySize.y;
-               }
-
-               bool health_baralign, armor_baralign, fuel_baralign;
-               bool health_iconalign, armor_iconalign;
-               if (autocvar_hud_panel_healtharmor_flip)
-               {
-                       armor_baralign = (autocvar_hud_panel_healtharmor_baralign == 2 || autocvar_hud_panel_healtharmor_baralign == 1);
-                       health_baralign = (autocvar_hud_panel_healtharmor_baralign == 3 || autocvar_hud_panel_healtharmor_baralign == 1);
-                       fuel_baralign = health_baralign;
-                       armor_iconalign = (autocvar_hud_panel_healtharmor_iconalign == 2 || autocvar_hud_panel_healtharmor_iconalign == 1);
-                       health_iconalign = (autocvar_hud_panel_healtharmor_iconalign == 3 || autocvar_hud_panel_healtharmor_iconalign == 1);
-               }
-               else
-               {
-                       health_baralign = (autocvar_hud_panel_healtharmor_baralign == 2 || autocvar_hud_panel_healtharmor_baralign == 1);
-                       armor_baralign = (autocvar_hud_panel_healtharmor_baralign == 3 || autocvar_hud_panel_healtharmor_baralign == 1);
-                       fuel_baralign = armor_baralign;
-                       health_iconalign = (autocvar_hud_panel_healtharmor_iconalign == 2 || autocvar_hud_panel_healtharmor_iconalign == 1);
-                       armor_iconalign = (autocvar_hud_panel_healtharmor_iconalign == 3 || autocvar_hud_panel_healtharmor_iconalign == 1);
-               }
-
-               //if(health)
-               {
-                       if(autocvar_hud_panel_healtharmor_progressbar)
-                       {
-                               float p_health, pain_health_alpha;
-                               p_health = health;
-                               pain_health_alpha = 1;
-                               if (autocvar_hud_panel_healtharmor_progressbar_gfx)
-                               {
-                                       if (autocvar_hud_panel_healtharmor_progressbar_gfx_smooth > 0)
-                                       {
-                                               if (fabs(prev_health - health) >= autocvar_hud_panel_healtharmor_progressbar_gfx_smooth)
-                                               {
-                                                       if (time - old_p_healthtime < 1)
-                                                               old_p_health = prev_p_health;
-                                                       else
-                                                               old_p_health = prev_health;
-                                                       old_p_healthtime = time;
-                                               }
-                                               if (time - old_p_healthtime < 1)
-                                               {
-                                                       p_health += (old_p_health - health) * (1 - (time - old_p_healthtime));
-                                                       prev_p_health = p_health;
-                                               }
-                                       }
-                                       if (autocvar_hud_panel_healtharmor_progressbar_gfx_damage > 0)
-                                       {
-                                               if (prev_health - health >= autocvar_hud_panel_healtharmor_progressbar_gfx_damage)
-                                               {
-                                                       if (time - health_damagetime >= 1)
-                                                               health_beforedamage = prev_health;
-                                                       health_damagetime = time;
-                                               }
-                                               if (time - health_damagetime < 1)
-                                               {
-                                                       float health_damagealpha = 1 - (time - health_damagetime)*(time - health_damagetime);
-                                                       HUD_Panel_DrawProgressBar(pos + health_offset, mySize, autocvar_hud_panel_healtharmor_progressbar_health, health_beforedamage/maxhealth, is_vertical, health_baralign, autocvar_hud_progressbar_health_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * health_damagealpha, DRAWFLAG_NORMAL);
-                                               }
-                                       }
-                                       prev_health = health;
-
-                                       if (health <= autocvar_hud_panel_healtharmor_progressbar_gfx_lowhealth)
-                                       {
-                                               float BLINK_FACTOR = 0.15;
-                                               float BLINK_BASE = 0.85;
-                                               float BLINK_FREQ = 9;
-                                               pain_health_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ);
-                                       }
-                               }
-                               HUD_Panel_DrawProgressBar(pos + health_offset, mySize, autocvar_hud_panel_healtharmor_progressbar_health, p_health/maxhealth, is_vertical, health_baralign, autocvar_hud_progressbar_health_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * pain_health_alpha, DRAWFLAG_NORMAL);
-                       }
-                       if(autocvar_hud_panel_healtharmor_text)
-                               DrawNumIcon(pos + health_offset, mySize, health, "health", is_vertical, health_iconalign, HUD_Get_Num_Color(health, maxhealth), 1);
-               }
-
-               if(armor)
-               {
-                       if(autocvar_hud_panel_healtharmor_progressbar)
-                       {
-                               float p_armor;
-                               p_armor = armor;
-                               if (autocvar_hud_panel_healtharmor_progressbar_gfx)
-                               {
-                                       if (autocvar_hud_panel_healtharmor_progressbar_gfx_smooth > 0)
-                                       {
-                                               if (fabs(prev_armor - armor) >= autocvar_hud_panel_healtharmor_progressbar_gfx_smooth)
-                                               {
-                                                       if (time - old_p_armortime < 1)
-                                                               old_p_armor = prev_p_armor;
-                                                       else
-                                                               old_p_armor = prev_armor;
-                                                       old_p_armortime = time;
-                                               }
-                                               if (time - old_p_armortime < 1)
-                                               {
-                                                       p_armor += (old_p_armor - armor) * (1 - (time - old_p_armortime));
-                                                       prev_p_armor = p_armor;
-                                               }
-                                       }
-                                       if (autocvar_hud_panel_healtharmor_progressbar_gfx_damage > 0)
-                                       {
-                                               if (prev_armor - armor >= autocvar_hud_panel_healtharmor_progressbar_gfx_damage)
-                                               {
-                                                       if (time - armor_damagetime >= 1)
-                                                               armor_beforedamage = prev_armor;
-                                                       armor_damagetime = time;
-                                               }
-                                               if (time - armor_damagetime < 1)
-                                               {
-                                                       float armor_damagealpha = 1 - (time - armor_damagetime)*(time - armor_damagetime);
-                                                       HUD_Panel_DrawProgressBar(pos + armor_offset, mySize, autocvar_hud_panel_healtharmor_progressbar_armor, armor_beforedamage/maxarmor, is_vertical, armor_baralign, autocvar_hud_progressbar_armor_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * armor_damagealpha, DRAWFLAG_NORMAL);
-                                               }
-                                       }
-                                       prev_armor = armor;
-                               }
-                               HUD_Panel_DrawProgressBar(pos + armor_offset, mySize, autocvar_hud_panel_healtharmor_progressbar_armor, p_armor/maxarmor, is_vertical, armor_baralign, autocvar_hud_progressbar_armor_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
-                       }
-                       if(autocvar_hud_panel_healtharmor_text)
-                               DrawNumIcon(pos + armor_offset, mySize, armor, "armor", is_vertical, armor_iconalign, HUD_Get_Num_Color(armor, maxarmor), 1);
-               }
-
-               if(fuel)
-               {
-                       if (is_vertical)
-                               mySize.x *= 0.2 / 2; //if vertical always halve x to not cover too much numbers with 3 digits
-                       else
-                               mySize.y *= 0.2;
-                       if (panel_ar >= 4)
-                               mySize.x *= 2; //restore full panel size
-                       else if (panel_ar < 1/4)
-                               mySize.y *= 2; //restore full panel size
-                       HUD_Panel_DrawProgressBar(pos, mySize, "progressbar", fuel/100, is_vertical, fuel_baralign, autocvar_hud_progressbar_fuel_color, panel_fg_alpha * 0.8, DRAWFLAG_NORMAL);
-               }
-       }
-
-       draw_endBoldFont();
-}
-
-// Notification area (#4)
-//
-
-void HUD_Notify_Push(string icon, string attacker, string victim)
-{
-       if (icon == "")
-               return;
-
-       ++notify_count;
-       --notify_index;
-
-       if (notify_index == -1)
-               notify_index = NOTIFY_MAX_ENTRIES-1;
-
-       // Free old strings
-       if (notify_attackers[notify_index])
-               strunzone(notify_attackers[notify_index]);
-
-       if (notify_victims[notify_index])
-               strunzone(notify_victims[notify_index]);
-
-       if (notify_icons[notify_index])
-               strunzone(notify_icons[notify_index]);
-
-       // Allocate new strings
-       if (victim != "")
-       {
-               notify_attackers[notify_index] = strzone(attacker);
-               notify_victims[notify_index] = strzone(victim);
-       }
-       else
-       {
-               // In case of a notification without a victim, the attacker
-               // is displayed on the victim's side. Instead of special
-               // treatment later on, we can simply switch them here.
-               notify_attackers[notify_index] = string_null;
-               notify_victims[notify_index] = strzone(attacker);
-       }
-
-       notify_icons[notify_index] = strzone(icon);
-       notify_times[notify_index] = time;
-}
-
-void HUD_Notify()
-{
-       if (!autocvar__hud_configure)
-               if (!autocvar_hud_panel_notify)
-                       return;
-
-       HUD_Panel_UpdateCvars();
-       HUD_Panel_DrawBg(1);
-
-       if (!autocvar__hud_configure)
-               if (notify_count == 0)
-                       return;
-
-       vector pos, size;
-       pos  = panel_pos;
-       size = panel_size;
-
-       if (panel_bg_padding)
-       {
-               pos  += '1 1 0' * panel_bg_padding;
-               size -= '2 2 0' * panel_bg_padding;
-       }
-
-       float fade_start = max(0, autocvar_hud_panel_notify_time);
-       float fade_time = max(0, autocvar_hud_panel_notify_fadetime);
-       float icon_aspect = max(1, autocvar_hud_panel_notify_icon_aspect);
-
-       int entry_count = bound(1, floor(NOTIFY_MAX_ENTRIES * size.y / size.x), NOTIFY_MAX_ENTRIES);
-       float entry_height = size.y / entry_count;
-
-       float panel_width_half = size.x * 0.5;
-       float icon_width_half = entry_height * icon_aspect / 2;
-       float name_maxwidth = panel_width_half - icon_width_half - size.x * NOTIFY_ICON_MARGIN;
-
-       vector font_size = '0.5 0.5 0' * entry_height * autocvar_hud_panel_notify_fontsize;
-       vector icon_size = (eX * icon_aspect + eY) * entry_height;
-       vector icon_left = eX * (panel_width_half - icon_width_half);
-       vector attacker_right = eX * name_maxwidth;
-       vector victim_left = eX * (size.x - name_maxwidth);
-
-       vector attacker_pos, victim_pos, icon_pos;
-       string attacker, victim, icon;
-       int i, j, count, step, limit;
-       float alpha;
-
-       if (autocvar_hud_panel_notify_flip)
-       {
-               // Order items from the top down
-               i = 0;
-               step = +1;
-               limit = entry_count;
-       }
-       else
-       {
-               // Order items from the bottom up
-               i = entry_count - 1;
-               step = -1;
-               limit = -1;
-       }
-
-       for (j = notify_index, count = 0; i != limit; i += step, ++j, ++count)
-       {
-               if(autocvar__hud_configure)
-               {
-                       attacker = sprintf(_("Player %d"), count + 1);
-                       victim = sprintf(_("Player %d"), count + 2);
-                       icon = get_weaponinfo(min(WEP_FIRST + count * 2, WEP_LAST)).model2;
-                       alpha = bound(0, 1.2 - count / entry_count, 1);
-               }
-               else
-               {
-                       if (j == NOTIFY_MAX_ENTRIES)
-                               j = 0;
-
-                       if (notify_times[j] + fade_start > time)
-                               alpha = 1;
-                       else if (fade_time != 0)
-                       {
-                               alpha = bound(0, (notify_times[j] + fade_start + fade_time - time) / fade_time, 1);
-                               if (alpha == 0)
-                                       break;
-                       }
-                       else
-                               break;
-
-                       attacker = notify_attackers[j];
-                       victim = notify_victims[j];
-                       icon = notify_icons[j];
-               }
-
-               if (icon != "" && victim != "")
-               {
-                       vector name_top = eY * (i * entry_height + 0.5 * (entry_height - font_size.y));
-
-                       icon_pos = pos + icon_left + eY * i * entry_height;
-                       drawpic_aspect_skin(icon_pos, icon, icon_size, '1 1 1', panel_fg_alpha * alpha, DRAWFLAG_NORMAL);
-
-                       victim = textShortenToWidth(victim, name_maxwidth, font_size, stringwidth_colors);
-                       victim_pos = pos + victim_left + name_top;
-                       drawcolorcodedstring(victim_pos, victim, font_size, panel_fg_alpha * alpha, DRAWFLAG_NORMAL);
-
-                       if (attacker != "")
-                       {
-                               attacker = textShortenToWidth(attacker, name_maxwidth, font_size, stringwidth_colors);
-                               attacker_pos = pos + attacker_right - eX * stringwidth(attacker, true, font_size) + name_top;
-                               drawcolorcodedstring(attacker_pos, attacker, font_size, panel_fg_alpha * alpha, DRAWFLAG_NORMAL);
-                       }
-               }
-       }
-
-       notify_count = count;
-}
-
-void HUD_Timer()
-{
-       if(!autocvar__hud_configure)
-       {
-               if(!autocvar_hud_panel_timer) return;
-       }
-
-       HUD_Panel_UpdateCvars();
-
-       draw_beginBoldFont();
-
-       vector pos, mySize;
-       pos = panel_pos;
-       mySize = panel_size;
-
-       HUD_Panel_DrawBg(1);
-       if(panel_bg_padding)
-       {
-               pos += '1 1 0' * panel_bg_padding;
-               mySize -= '2 2 0' * panel_bg_padding;
-       }
-
-       string timer;
-       float timelimit, elapsedTime, timeleft, minutesLeft;
-
-       timelimit = getstatf(STAT_TIMELIMIT);
-
-       timeleft = max(0, timelimit * 60 + getstatf(STAT_GAMESTARTTIME) - time);
-       timeleft = ceil(timeleft);
-
-       minutesLeft = floor(timeleft / 60);
-
-       vector timer_color;
-       if(minutesLeft >= 5 || warmup_stage || timelimit == 0) //don't use red or yellow in warmup or when there is no timelimit
-               timer_color = '1 1 1'; //white
-       else if(minutesLeft >= 1)
-               timer_color = '1 1 0'; //yellow
-       else
-               timer_color = '1 0 0'; //red
-
-       if (autocvar_hud_panel_timer_increment || timelimit == 0 || warmup_stage) {
-               if (time < getstatf(STAT_GAMESTARTTIME)) {
-                       //while restart is still active, show 00:00
-                       timer = seconds_tostring(0);
-               } else {
-                       elapsedTime = floor(time - getstatf(STAT_GAMESTARTTIME)); //127
-                       timer = seconds_tostring(elapsedTime);
-               }
-       } else {
-               timer = seconds_tostring(timeleft);
-       }
-
-       drawstring_aspect(pos, timer, mySize, timer_color, panel_fg_alpha, DRAWFLAG_NORMAL);
-
-       draw_endBoldFont();
-}
-
-// Radar (#6)
-//
-
-float HUD_Radar_Clickable()
-{
-       return hud_panel_radar_mouse && !hud_panel_radar_temp_hidden;
-}
-
-void HUD_Radar_Show_Maximized(bool doshow,float clickable)
-{
-       hud_panel_radar_maximized = doshow;
-       hud_panel_radar_temp_hidden = 0;
-
-       if ( doshow )
-       {
-               if (clickable)
-               {
-                       if(autocvar_hud_cursormode)
-                               setcursormode(1);
-                       hud_panel_radar_mouse = 1;
-               }
-       }
-       else if ( hud_panel_radar_mouse )
-       {
-               hud_panel_radar_mouse = 0;
-               mouseClicked = 0;
-               if(autocvar_hud_cursormode)
-               if(!mv_active)
-                       setcursormode(0);
-       }
-}
-void HUD_Radar_Hide_Maximized()
-{
-       HUD_Radar_Show_Maximized(false,false);
-}
-
-
-float HUD_Radar_InputEvent(float bInputType, float nPrimary, float nSecondary)
-{
-       if(!hud_panel_radar_maximized || !hud_panel_radar_mouse ||
-               autocvar__hud_configure || mv_active)
-               return false;
-
-       if(bInputType == 3)
-       {
-               mousepos_x = nPrimary;
-               mousepos_y = nSecondary;
-               return true;
-       }
-
-       if(nPrimary == K_MOUSE1)
-       {
-               if(bInputType == 0) // key pressed
-                       mouseClicked |= S_MOUSE1;
-               else if(bInputType == 1) // key released
-                       mouseClicked -= (mouseClicked & S_MOUSE1);
-       }
-       else if(nPrimary == K_MOUSE2)
-       {
-               if(bInputType == 0) // key pressed
-                       mouseClicked |= S_MOUSE2;
-               else if(bInputType == 1) // key released
-                       mouseClicked -= (mouseClicked & S_MOUSE2);
-       }
-       else if ( nPrimary == K_ESCAPE && bInputType == 0 )
-       {
-               HUD_Radar_Hide_Maximized();
-       }
-       else
-       {
-               // allow console/use binds to work without hiding the map
-               string con_keys;
-               float keys;
-               float i;
-               con_keys = strcat(findkeysforcommand("toggleconsole", 0)," ",findkeysforcommand("+use", 0)) ;
-               keys = tokenize(con_keys); // findkeysforcommand returns data for this
-               for (i = 0; i < keys; ++i)
-               {
-                       if(nPrimary == stof(argv(i)))
-                               return false;
-               }
-
-               if ( getstati(STAT_HEALTH) <= 0 )
-               {
-                       // Show scoreboard
-                       if ( bInputType < 2 )
-                       {
-                               con_keys = findkeysforcommand("+showscores", 0);
-                               keys = tokenize(con_keys);
-                               for (i = 0; i < keys; ++i)
-                               {
-                                       if ( nPrimary == stof(argv(i)) )
-                                       {
-                                               hud_panel_radar_temp_hidden = bInputType == 0;
-                                               return false;
-                                       }
-                               }
-                       }
-               }
-               else if ( bInputType == 0 )
-                       HUD_Radar_Hide_Maximized();
-
-               return false;
-       }
-
-       return true;
-}
-
-void HUD_Radar_Mouse()
-{
-       if ( !hud_panel_radar_mouse ) return;
-       if(mv_active) return;
-
-       if ( intermission )
-       {
-               HUD_Radar_Hide_Maximized();
-               return;
-       }
-
-       if(mouseClicked & S_MOUSE2)
-       {
-               HUD_Radar_Hide_Maximized();
-               return;
-       }
-
-       if(!autocvar_hud_cursormode)
-       {
-               mousepos = mousepos + getmousepos() * autocvar_menu_mouse_speed;
-
-               mousepos_x = bound(0, mousepos_x, vid_conwidth);
-               mousepos_y = bound(0, mousepos_y, vid_conheight);
-       }
-
-       HUD_Panel_UpdateCvars();
-
-
-       panel_size = autocvar_hud_panel_radar_maximized_size;
-       panel_size_x = bound(0.2, panel_size_x, 1) * vid_conwidth;
-       panel_size_y = bound(0.2, panel_size_y, 1) * vid_conheight;
-       panel_pos_x = (vid_conwidth - panel_size_x) / 2;
-       panel_pos_y = (vid_conheight - panel_size_y) / 2;
-
-       if(mouseClicked & S_MOUSE1)
-       {
-               // click outside
-               if ( mousepos_x < panel_pos_x || mousepos_x > panel_pos_x + panel_size_x ||
-                        mousepos_y < panel_pos_y || mousepos_y > panel_pos_y + panel_size_y )
-               {
-                       HUD_Radar_Hide_Maximized();
-                       return;
-               }
-               vector pos = teamradar_texcoord_to_3dcoord(teamradar_2dcoord_to_texcoord(mousepos),view_origin_z);
-               localcmd(sprintf("cmd ons_spawn %f %f %f",pos_x,pos_y,pos_z));
-
-               HUD_Radar_Hide_Maximized();
-               return;
-       }
-
-
-       const vector cursor_size = '32 32 0';
-       drawpic(mousepos-'8 4 0', strcat("gfx/menu/", autocvar_menu_skin, "/cursor.tga"), cursor_size, '1 1 1', 0.8, DRAWFLAG_NORMAL);
-}
-
-void HUD_Radar()
-{
-       if (!autocvar__hud_configure)
-       {
-               if (hud_panel_radar_maximized)
-               {
-                       if (!hud_draw_maximized) return;
-               }
-               else
-               {
-                       if (autocvar_hud_panel_radar == 0) return;
-                       if (autocvar_hud_panel_radar != 2 && !teamplay) return;
-                       if(radar_panel_modified)
-                       {
-                               panel.update_time = time; // forces reload of panel attributes
-                               radar_panel_modified = false;
-                       }
-               }
-       }
-
-       if ( hud_panel_radar_temp_hidden )
-               return;
-
-       HUD_Panel_UpdateCvars();
-
-       float f = 0;
-
-       if (hud_panel_radar_maximized && !autocvar__hud_configure)
-       {
-               panel_size = autocvar_hud_panel_radar_maximized_size;
-               panel_size.x = bound(0.2, panel_size.x, 1) * vid_conwidth;
-               panel_size.y = bound(0.2, panel_size.y, 1) * vid_conheight;
-               panel_pos.x = (vid_conwidth - panel_size.x) / 2;
-               panel_pos.y = (vid_conheight - panel_size.y) / 2;
-
-               string panel_bg;
-               panel_bg = strcat(hud_skin_path, "/border_default"); // always use the default border when maximized
-               if(precache_pic(panel_bg) == "")
-                       panel_bg = "gfx/hud/default/border_default"; // fallback
-               if(!radar_panel_modified && panel_bg != panel.current_panel_bg)
-                       radar_panel_modified = true;
-               if(panel.current_panel_bg)
-                       strunzone(panel.current_panel_bg);
-               panel.current_panel_bg = strzone(panel_bg);
-
-               switch(hud_panel_radar_maximized_zoommode)
-               {
-                       default:
-                       case 0:
-                               f = current_zoomfraction;
-                               break;
-                       case 1:
-                               f = 1 - current_zoomfraction;
-                               break;
-                       case 2:
-                               f = 0;
-                               break;
-                       case 3:
-                               f = 1;
-                               break;
-               }
-
-               switch(hud_panel_radar_maximized_rotation)
-               {
-                       case 0:
-                               teamradar_angle = view_angles.y - 90;
-                               break;
-                       default:
-                               teamradar_angle = 90 * hud_panel_radar_maximized_rotation;
-                               break;
-               }
-       }
-       if (!hud_panel_radar_maximized && !autocvar__hud_configure)
-       {
-               switch(hud_panel_radar_zoommode)
-               {
-                       default:
-                       case 0:
-                               f = current_zoomfraction;
-                               break;
-                       case 1:
-                               f = 1 - current_zoomfraction;
-                               break;
-                       case 2:
-                               f = 0;
-                               break;
-                       case 3:
-                               f = 1;
-                               break;
-               }
-
-               switch(hud_panel_radar_rotation)
-               {
-                       case 0:
-                               teamradar_angle = view_angles.y - 90;
-                               break;
-                       default:
-                               teamradar_angle = 90 * hud_panel_radar_rotation;
-                               break;
-               }
-       }
-
-       vector pos, mySize;
-       pos = panel_pos;
-       mySize = panel_size;
-
-       HUD_Panel_DrawBg(1);
-       if(panel_bg_padding)
-       {
-               pos += '1 1 0' * panel_bg_padding;
-               mySize -= '2 2 0' * panel_bg_padding;
-       }
-
-       int color2;
-       entity tm;
-       float scale2d, normalsize, bigsize;
-
-       teamradar_origin2d = pos + 0.5 * mySize;
-       teamradar_size2d = mySize;
-
-       if(minimapname == "")
-               return;
-
-       teamradar_loadcvars();
-
-       scale2d = vlen_maxnorm2d(mi_picmax - mi_picmin);
-       teamradar_size2d = mySize;
-
-       teamradar_extraclip_mins = teamradar_extraclip_maxs = '0 0 0'; // we always center
-
-       // pixels per world qu to match the teamradar_size2d_x range in the longest dimension
-       if((hud_panel_radar_rotation == 0 && !hud_panel_radar_maximized) || (hud_panel_radar_maximized_rotation == 0 && hud_panel_radar_maximized))
-       {
-               // max-min distance must fit the radar in any rotation
-               bigsize = vlen_minnorm2d(teamradar_size2d) * scale2d / (1.05 * vlen2d(mi_scale));
-       }
-       else
-       {
-               vector c0, c1, c2, c3, span;
-               c0 = rotate(mi_min, teamradar_angle * DEG2RAD);
-               c1 = rotate(mi_max, teamradar_angle * DEG2RAD);
-               c2 = rotate('1 0 0' * mi_min.x + '0 1 0' * mi_max.y, teamradar_angle * DEG2RAD);
-               c3 = rotate('1 0 0' * mi_max.x + '0 1 0' * mi_min.y, teamradar_angle * DEG2RAD);
-               span = '0 0 0';
-               span.x = max(c0_x, c1_x, c2_x, c3_x) - min(c0_x, c1_x, c2_x, c3_x);
-               span.y = max(c0_y, c1_y, c2_y, c3_y) - min(c0_y, c1_y, c2_y, c3_y);
-
-               // max-min distance must fit the radar in x=x, y=y
-               bigsize = min(
-                       teamradar_size2d.x * scale2d / (1.05 * span.x),
-                       teamradar_size2d.y * scale2d / (1.05 * span.y)
-               );
-       }
-
-       normalsize = vlen_maxnorm2d(teamradar_size2d) * scale2d / hud_panel_radar_scale;
-       if(bigsize > normalsize)
-               normalsize = bigsize;
-
-       teamradar_size =
-                 f * bigsize
-               + (1 - f) * normalsize;
-       teamradar_origin3d_in_texcoord = teamradar_3dcoord_to_texcoord(
-                 f * mi_center
-               + (1 - f) * view_origin);
-
-       drawsetcliparea(
-               pos.x,
-               pos.y,
-               mySize.x,
-               mySize.y
-       );
-
-       draw_teamradar_background(hud_panel_radar_foreground_alpha);
-
-       for(tm = world; (tm = find(tm, classname, "radarlink")); )
-               draw_teamradar_link(tm.origin, tm.velocity, tm.team);
-
-       vector coord;
-       vector brightcolor;
-       for(tm = world; (tm = findflags(tm, teamradar_icon, 0xFFFFFF)); )
-       {
-               if ( hud_panel_radar_mouse )
-               if ( tm.health > 0 )
-               if ( tm.team == myteam+1 )
-               {
-                       coord = teamradar_texcoord_to_2dcoord(teamradar_3dcoord_to_texcoord(tm.origin));
-                       if ( vlen(mousepos-coord) < 8 )
-                       {
-                               brightcolor_x = min(1,tm.teamradar_color_x*1.5);
-                               brightcolor_y = min(1,tm.teamradar_color_y*1.5);
-                               brightcolor_z = min(1,tm.teamradar_color_z*1.5);
-                               drawpic(coord - '8 8 0', "gfx/teamradar_icon_glow", '16 16 0', brightcolor, panel_fg_alpha, 0);
-                       }
-               }
-               entity icon = RadarIcons_from(tm.teamradar_icon);
-               draw_teamradar_icon(tm.origin, icon, tm, spritelookupcolor(tm, icon.netname, tm.teamradar_color), panel_fg_alpha);
-       }
-       for(tm = world; (tm = find(tm, classname, "entcs_receiver")); )
-       {
-               color2 = GetPlayerColor(tm.sv_entnum);
-               //if(color == NUM_SPECTATOR || color == color2)
-                       draw_teamradar_player(tm.origin, tm.angles, Team_ColorRGB(color2));
-       }
-       draw_teamradar_player(view_origin, view_angles, '1 1 1');
-
-       drawresetcliparea();
-
-       if ( hud_panel_radar_mouse )
-       {
-               string message = "Click to select teleport destination";
-
-               if ( getstati(STAT_HEALTH) <= 0 )
-               {
-                       message = "Click to select spawn location";
-               }
-
-               drawcolorcodedstring(pos + '0.5 0 0' * (mySize_x - stringwidth(message, true, hud_fontsize)) - '0 1 0' * hud_fontsize_y * 2,
-                                                        message, hud_fontsize, hud_panel_radar_foreground_alpha, DRAWFLAG_NORMAL);
-
-               hud_panel_radar_bottom = pos_y + mySize_y + hud_fontsize_y;
-       }
-}
-
-// Score (#7)
-//
-void HUD_UpdatePlayerTeams();
-void HUD_Score_Rankings(vector pos, vector mySize, entity me)
-{
-       float score;
-       entity tm = world, pl;
-       int SCOREPANEL_MAX_ENTRIES = 6;
-       float SCOREPANEL_ASPECTRATIO = 2;
-       int entries = bound(1, floor(SCOREPANEL_MAX_ENTRIES * mySize.y/mySize.x * SCOREPANEL_ASPECTRATIO), SCOREPANEL_MAX_ENTRIES);
-       vector fontsize = '1 1 0' * (mySize.y/entries);
-
-       vector rgb, score_color;
-       rgb = '1 1 1';
-       score_color = '1 1 1';
-
-       float name_size = mySize.x*0.75;
-       float spacing_size = mySize.x*0.04;
-       const float highlight_alpha = 0.2;
-       int i = 0, first_pl = 0;
-       bool me_printed = false;
-       string s;
-       if (autocvar__hud_configure)
-       {
-               float players_per_team = 0;
-               if (team_count)
-               {
-                       // show team scores in the first line
-                       float score_size = mySize.x / team_count;
-                       players_per_team = max(2, ceil((entries - 1) / team_count));
-                       for(i=0; i<team_count; ++i) {
-                               if (i == floor((entries - 2) / players_per_team) || (entries == 1 && i == 0))
-                                       HUD_Panel_DrawHighlight(pos + eX * score_size * i, eX * score_size + eY * fontsize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-                               drawstring_aspect(pos + eX * score_size * i, ftos(175 - 23*i), eX * score_size + eY * fontsize.y, Team_ColorRGB(ColorByTeam(i)) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
-                       }
-                       first_pl = 1;
-                       pos.y += fontsize.y;
-               }
-               score = 10 + SCOREPANEL_MAX_ENTRIES * 3;
-               for (i=first_pl; i<entries; ++i)
-               {
-                       //simulate my score is lower than all displayed players,
-                       //so that I don't appear at all showing pure rankings.
-                       //This is to better show the difference between the 2 ranking views
-                       if (i == entries-1 && autocvar_hud_panel_score_rankings == 1)
-                       {
-                               rgb = '1 1 0';
-                               drawfill(pos, eX * mySize.x + eY * fontsize.y, rgb, highlight_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
-                               s = GetPlayerName(player_localnum);
-                               score = 7;
-                       }
-                       else
-                       {
-                               s = sprintf(_("Player %d"), i + 1 - first_pl);
-                               score -= 3;
-                       }
-
-                       if (team_count)
-                               score_color = Team_ColorRGB(ColorByTeam(floor((i - first_pl) / players_per_team))) * 0.8;
-                       s = textShortenToWidth(s, name_size, fontsize, stringwidth_colors);
-                       drawcolorcodedstring(pos + eX * (name_size - stringwidth(s, true, fontsize)), s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
-                       drawstring(pos + eX * (name_size + spacing_size), ftos(score), fontsize, score_color, panel_fg_alpha, DRAWFLAG_NORMAL);
-                       pos.y += fontsize.y;
-               }
-               return;
-       }
-
-       if (!scoreboard_fade_alpha) // the scoreboard too calls HUD_UpdatePlayerTeams
-               HUD_UpdatePlayerTeams();
-       if (team_count)
-       {
-               // show team scores in the first line
-               float score_size = mySize.x / team_count;
-               for(tm = teams.sort_next; tm; tm = tm.sort_next) {
-                       if(tm.team == NUM_SPECTATOR)
-                               continue;
-                       if (tm.team == myteam)
-                               drawfill(pos + eX * score_size * i, eX * score_size + eY * fontsize.y, '1 1 1', highlight_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
-                       drawstring_aspect(pos + eX * score_size * i, ftos(tm.(teamscores[ts_primary])), eX * score_size + eY * fontsize.y, Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
-                       ++i;
-               }
-               first_pl = 1;
-               pos.y += fontsize.y;
-               tm = teams.sort_next;
-       }
-       i = first_pl;
-
-       do
-       for (pl = players.sort_next; pl && i<entries; pl = pl.sort_next)
-       {
-               if ((team_count && pl.team != tm.team) || pl.team == NUM_SPECTATOR)
-                       continue;
-
-               if (i == entries-1 && !me_printed && pl != me)
-               if (autocvar_hud_panel_score_rankings == 1 && spectatee_status != -1)
-               {
-                       for (pl = me.sort_next; pl; pl = pl.sort_next)
-                               if (pl.team != NUM_SPECTATOR)
-                                       break;
-
-                       if (pl)
-                               rgb = '1 1 0'; //not last but not among the leading players: yellow
-                       else
-                               rgb = '1 0 0'; //last: red
-                       pl = me;
-               }
-
-               if (pl == me)
-               {
-                       if (i == first_pl)
-                               rgb = '0 1 0'; //first: green
-                       me_printed = true;
-                       drawfill(pos, eX * mySize.x + eY * fontsize.y, rgb, highlight_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
-               }
-               if (team_count)
-                       score_color = Team_ColorRGB(pl.team) * 0.8;
-               s = textShortenToWidth(GetPlayerName(pl.sv_entnum), name_size, fontsize, stringwidth_colors);
-               drawcolorcodedstring(pos + eX * (name_size - stringwidth(s, true, fontsize)), s, fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
-               drawstring(pos + eX * (name_size + spacing_size), ftos(pl.(scores[ps_primary])), fontsize, score_color, panel_fg_alpha, DRAWFLAG_NORMAL);
-               pos.y += fontsize.y;
-               ++i;
-       }
-       while (i<entries && team_count && (tm = tm.sort_next) && (tm.team != NUM_SPECTATOR || (tm = tm.sort_next)));
-}
-
-void HUD_Score()
-{
-       if(!autocvar__hud_configure)
-       {
-               if(!autocvar_hud_panel_score) return;
-               if(spectatee_status == -1 && (gametype == MAPINFO_TYPE_RACE || gametype == MAPINFO_TYPE_CTS)) return;
-       }
-
-       HUD_Panel_UpdateCvars();
-       vector pos, mySize;
-       pos = panel_pos;
-       mySize = panel_size;
-
-       HUD_Panel_DrawBg(1);
-       if(panel_bg_padding)
-       {
-               pos += '1 1 0' * panel_bg_padding;
-               mySize -= '2 2 0' * panel_bg_padding;
-       }
-
-       float score, distribution = 0;
-       string sign;
-       vector distribution_color;
-       entity tm, pl, me;
-
-       me = playerslots[current_player];
-
-       if((scores_flags[ps_primary] & SFL_TIME) && !teamplay) { // race/cts record display on HUD
-               string timer, distrtimer;
-
-               pl = players.sort_next;
-               if(pl == me)
-                       pl = pl.sort_next;
-               if(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)
-                       if(pl.scores[ps_primary] == 0)
-                               pl = world;
-
-               score = me.(scores[ps_primary]);
-               timer = TIME_ENCODED_TOSTRING(score);
-
-               draw_beginBoldFont();
-               if (pl && ((!(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)) || score)) {
-                       // distribution display
-                       distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]);
-
-                       distrtimer = ftos_decimals(fabs(distribution/pow(10, TIME_DECIMALS)), TIME_DECIMALS);
-
-                       if (distribution <= 0) {
-                               distribution_color = '0 1 0';
-                               sign = "-";
-                       }
-                       else {
-                               distribution_color = '1 0 0';
-                               sign = "+";
-                       }
-                       drawstring_aspect(pos + eX * 0.75 * mySize.x, strcat(sign, distrtimer), eX * 0.25 * mySize.x + eY * (1/3) * mySize.y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL);
-               }
-               // race record display
-               if (distribution <= 0)
-                       HUD_Panel_DrawHighlight(pos, eX * 0.75 * mySize.x + eY * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-               drawstring_aspect(pos, timer, eX * 0.75 * mySize.x + eY * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-               draw_endBoldFont();
-       } else if (!teamplay) { // non-teamgames
-               if ((spectatee_status == -1 && !autocvar__hud_configure) || autocvar_hud_panel_score_rankings)
-               {
-                       HUD_Score_Rankings(pos, mySize, me);
-                       return;
-               }
-               // me vector := [team/connected frags id]
-               pl = players.sort_next;
-               if(pl == me)
-                       pl = pl.sort_next;
-
-               if(autocvar__hud_configure)
-                       distribution = 42;
-               else if(pl)
-                       distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]);
-               else
-                       distribution = 0;
-
-               score = me.(scores[ps_primary]);
-               if(autocvar__hud_configure)
-                       score = 123;
-
-               if(distribution >= 5)
-                       distribution_color = eY;
-               else if(distribution >= 0)
-                       distribution_color = '1 1 1';
-               else if(distribution >= -5)
-                       distribution_color = '1 1 0';
-               else
-                       distribution_color = eX;
-
-               string distribution_str;
-               distribution_str = ftos(distribution);
-               draw_beginBoldFont();
-               if (distribution >= 0)
-               {
-                       if (distribution > 0)
-                               distribution_str = strcat("+", distribution_str);
-                       HUD_Panel_DrawHighlight(pos, eX * 0.75 * mySize.x + eY * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-               }
-               drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize.x + eY * mySize.y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL);
-               drawstring_aspect(pos + eX * 0.75 * mySize.x, distribution_str, eX * 0.25 * mySize.x + eY * (1/3) * mySize.y, distribution_color, panel_fg_alpha, DRAWFLAG_NORMAL);
-               draw_endBoldFont();
-       } else { // teamgames
-               float row, column, rows = 0, columns = 0;
-               vector offset = '0 0 0';
-               vector score_pos, score_size; //for scores other than myteam
-               if(autocvar_hud_panel_score_rankings)
-               {
-                       HUD_Score_Rankings(pos, mySize, me);
-                       return;
-               }
-               if(spectatee_status == -1)
-               {
-                       rows = HUD_GetRowCount(team_count, mySize, 3);
-                       columns = ceil(team_count/rows);
-                       score_size = eX * mySize.x*(1/columns) + eY * mySize.y*(1/rows);
-
-                       float newSize;
-                       if(score_size.x/score_size.y > 3)
-                       {
-                               newSize = 3 * score_size.y;
-                               offset.x = score_size.x - newSize;
-                               pos.x += offset.x/2;
-                               score_size.x = newSize;
-                       }
-                       else
-                       {
-                               newSize = 1/3 * score_size.x;
-                               offset.y = score_size.y - newSize;
-                               pos.y += offset.y/2;
-                               score_size.y = newSize;
-                       }
-               }
-               else
-                       score_size = eX * mySize.x*(1/4) + eY * mySize.y*(1/3);
-
-               float max_fragcount;
-               max_fragcount = -99;
-               draw_beginBoldFont();
-               row = column = 0;
-               for(tm = teams.sort_next; tm; tm = tm.sort_next) {
-                       if(tm.team == NUM_SPECTATOR)
-                               continue;
-                       score = tm.(teamscores[ts_primary]);
-                       if(autocvar__hud_configure)
-                               score = 123;
-
-                       if (score > max_fragcount)
-                               max_fragcount = score;
-
-                       if (spectatee_status == -1)
-                       {
-                               score_pos = pos + eX * column * (score_size.x + offset.x) + eY * row * (score_size.y + offset.y);
-                               if (max_fragcount == score)
-                                       HUD_Panel_DrawHighlight(score_pos, score_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-                               drawstring_aspect(score_pos, ftos(score), score_size, Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
-                               ++row;
-                               if(row >= rows)
-                               {
-                                       row = 0;
-                                       ++column;
-                               }
-                       }
-                       else if(tm.team == myteam) {
-                               if (max_fragcount == score)
-                                       HUD_Panel_DrawHighlight(pos, eX * 0.75 * mySize.x + eY * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-                               drawstring_aspect(pos, ftos(score), eX * 0.75 * mySize.x + eY * mySize.y, Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
-                       } else {
-                               if (max_fragcount == score)
-                                       HUD_Panel_DrawHighlight(pos + eX * 0.75 * mySize.x + eY * (1/3) * rows * mySize.y, score_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-                               drawstring_aspect(pos + eX * 0.75 * mySize.x + eY * (1/3) * rows * mySize.y, ftos(score), score_size, Team_ColorRGB(tm.team) * 0.8, panel_fg_alpha, DRAWFLAG_NORMAL);
-                               ++rows;
-                       }
-               }
-               draw_endBoldFont();
-       }
-}
-
-// Race timer (#8)
-//
-void HUD_RaceTimer ()
-{
-       if(!autocvar__hud_configure)
-       {
-               if(!autocvar_hud_panel_racetimer) return;
-               if(!(gametype == MAPINFO_TYPE_RACE || gametype == MAPINFO_TYPE_CTS)) return;
-               if(spectatee_status == -1) return;
-       }
-
-       HUD_Panel_UpdateCvars();
-
-       vector pos, mySize;
-       pos = panel_pos;
-       mySize = panel_size;
-
-       HUD_Panel_DrawBg(1);
-       if(panel_bg_padding)
-       {
-               pos += '1 1 0' * panel_bg_padding;
-               mySize -= '2 2 0' * panel_bg_padding;
-       }
-
-       // always force 4:1 aspect
-       vector newSize = '0 0 0';
-       if(mySize.x/mySize.y > 4)
-       {
-               newSize.x = 4 * mySize.y;
-               newSize.y = mySize.y;
-
-               pos.x = pos.x + (mySize.x - newSize.x) / 2;
-       }
-       else
-       {
-               newSize.y = 1/4 * mySize.x;
-               newSize.x = mySize.x;
-
-               pos.y = pos.y + (mySize.y - newSize.y) / 2;
-       }
-       mySize = newSize;
-
-       float a, t;
-       string s, forcetime;
-
-       if(autocvar__hud_configure)
-       {
-               s = "0:13:37";
-               draw_beginBoldFont();
-               drawstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, false, '0.60 0.60 0' * mySize.y), s, '0.60 0.60 0' * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-               draw_endBoldFont();
-               s = _("^1Intermediate 1 (+15.42)");
-               drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, true, '1 1 0' * 0.20 * mySize.y) + eY * 0.60 * mySize.y, s, '1 1 0' * 0.20 * mySize.y, panel_fg_alpha, DRAWFLAG_NORMAL);
-               s = sprintf(_("^1PENALTY: %.1f (%s)"), 2, "missing a checkpoint");
-               drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, true, '1 1 0' * 0.20 * mySize.y) + eY * 0.80 * mySize.y, s, '1 1 0' * 0.20 * mySize.y, panel_fg_alpha, DRAWFLAG_NORMAL);
-       }
-       else if(race_checkpointtime)
-       {
-               a = bound(0, 2 - (time - race_checkpointtime), 1);
-               s = "";
-               forcetime = "";
-               if(a > 0) // just hit a checkpoint?
-               {
-                       if(race_checkpoint != 254)
-                       {
-                               if(race_time && race_previousbesttime)
-                                       s = MakeRaceString(race_checkpoint, TIME_DECODE(race_time) - TIME_DECODE(race_previousbesttime), 0, 0, race_previousbestname);
-                               else
-                                       s = MakeRaceString(race_checkpoint, 0, -1, 0, race_previousbestname);
-                               if(race_time)
-                                       forcetime = TIME_ENCODED_TOSTRING(race_time);
-                       }
-               }
-               else
-               {
-                       if(race_laptime && race_nextbesttime && race_nextcheckpoint != 254)
-                       {
-                               a = bound(0, 2 - ((race_laptime + TIME_DECODE(race_nextbesttime)) - (time + TIME_DECODE(race_penaltyaccumulator))), 1);
-                               if(a > 0) // next one?
-                               {
-                                       s = MakeRaceString(race_nextcheckpoint, (time + TIME_DECODE(race_penaltyaccumulator)) - race_laptime, TIME_DECODE(race_nextbesttime), 0, race_nextbestname);
-                               }
-                       }
-               }
-
-               if(s != "" && a > 0)
-               {
-                       drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, true, '1 1 0' * 0.2 * mySize.y) + eY * 0.6 * mySize.y, s, '1 1 0' * 0.2 * mySize.y, panel_fg_alpha * a, DRAWFLAG_NORMAL);
-               }
-
-               if(race_penaltytime)
-               {
-                       a = bound(0, 2 - (time - race_penaltyeventtime), 1);
-                       if(a > 0)
-                       {
-                               s = sprintf(_("^1PENALTY: %.1f (%s)"), race_penaltytime * 0.1, race_penaltyreason);
-                               drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, true, '1 1 0' * 0.2 * mySize.y) + eY * 0.8 * mySize.y, s, '1 1 0' * 0.2 * mySize.y, panel_fg_alpha * a, DRAWFLAG_NORMAL);
-                       }
-               }
-
-               draw_beginBoldFont();
-
-               if(forcetime != "")
-               {
-                       a = bound(0, (time - race_checkpointtime) / 0.5, 1);
-                       drawstring_expanding(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(forcetime, false, '1 1 0' * 0.6 * mySize.y), forcetime, '1 1 0' * 0.6 * mySize.y, '1 1 1', panel_fg_alpha, 0, a);
-               }
-               else
-                       a = 1;
-
-               if(race_laptime && race_checkpoint != 255)
-               {
-                       s = TIME_ENCODED_TOSTRING(TIME_ENCODE(time + TIME_DECODE(race_penaltyaccumulator) - race_laptime));
-                       drawstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, false, '0.6 0.6 0' * mySize.y), s, '0.6 0.6 0' * mySize.y, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
-               }
-
-               draw_endBoldFont();
-       }
-       else
-       {
-               if(race_mycheckpointtime)
-               {
-                       a = bound(0, 2 - (time - race_mycheckpointtime), 1);
-                       s = MakeRaceString(race_mycheckpoint, TIME_DECODE(race_mycheckpointdelta), -(race_mycheckpointenemy == ""), race_mycheckpointlapsdelta, race_mycheckpointenemy);
-                       drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, true, '1 1 0' * 0.2 * mySize.y) + eY * 0.6 * mySize.y, s, '1 1 0' * 0.2 * mySize.y, panel_fg_alpha * a, DRAWFLAG_NORMAL);
-               }
-               if(race_othercheckpointtime && race_othercheckpointenemy != "")
-               {
-                       a = bound(0, 2 - (time - race_othercheckpointtime), 1);
-                       s = MakeRaceString(race_othercheckpoint, -TIME_DECODE(race_othercheckpointdelta), -(race_othercheckpointenemy == ""), race_othercheckpointlapsdelta, race_othercheckpointenemy);
-                       drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, true, '1 1 0' * 0.2 * mySize.y) + eY * 0.6 * mySize.y, s, '1 1 0' * 0.2 * mySize.y, panel_fg_alpha * a, DRAWFLAG_NORMAL);
-               }
-
-               if(race_penaltytime && !race_penaltyaccumulator)
-               {
-                       t = race_penaltytime * 0.1 + race_penaltyeventtime;
-                       a = bound(0, (1 + t - time), 1);
-                       if(a > 0)
-                       {
-                               if(time < t)
-                                       s = sprintf(_("^1PENALTY: %.1f (%s)"), (t - time) * 0.1, race_penaltyreason);
-                               else
-                                       s = sprintf(_("^2PENALTY: %.1f (%s)"), 0, race_penaltyreason);
-                               drawcolorcodedstring(pos + eX * 0.5 * mySize.x - '0.5 0 0' * stringwidth(s, true, '1 1 0' * 0.2 * mySize.y) + eY * 0.6 * mySize.y, s, '1 1 0' * 0.2 * mySize.y, panel_fg_alpha * a, DRAWFLAG_NORMAL);
-                       }
-               }
-       }
-}
-
-// Vote window (#9)
-//
-
-void HUD_Vote()
-{
-       if(autocvar_cl_allow_uid2name == -1 && (gametype == MAPINFO_TYPE_CTS || gametype == MAPINFO_TYPE_RACE || (serverflags & SERVERFLAG_PLAYERSTATS)))
-       {
-               vote_active = 1;
-               if (autocvar__hud_configure)
-               {
-                       vote_yescount = 0;
-                       vote_nocount = 0;
-                       LOG_INFO(_("^1You must answer before entering hud configure mode\n"));
-                       cvar_set("_hud_configure", "0");
-               }
-               if(vote_called_vote)
-                       strunzone(vote_called_vote);
-               vote_called_vote = strzone(_("^2Name ^7instead of \"^1Anonymous player^7\" in stats"));
-               uid2name_dialog = 1;
-       }
-
-       if(!autocvar__hud_configure)
-       {
-               if(!autocvar_hud_panel_vote) return;
-
-               panel_fg_alpha = autocvar_hud_panel_fg_alpha;
-               panel_bg_alpha_str = autocvar_hud_panel_vote_bg_alpha;
-
-               if(panel_bg_alpha_str == "") {
-                       panel_bg_alpha_str = ftos(autocvar_hud_panel_bg_alpha);
-               }
-               panel_bg_alpha = stof(panel_bg_alpha_str);
-       }
-       else
-       {
-               vote_yescount = 3;
-               vote_nocount = 2;
-               vote_needed = 4;
-       }
-
-       string s;
-       float a;
-       if(vote_active != vote_prev) {
-               vote_change = time;
-               vote_prev = vote_active;
-       }
-
-       if(vote_active || autocvar__hud_configure)
-               vote_alpha = bound(0, (time - vote_change) * 2, 1);
-       else
-               vote_alpha = bound(0, 1 - (time - vote_change) * 2, 1);
-
-       if(!vote_alpha)
-               return;
-
-       HUD_Panel_UpdateCvars();
-
-       if(uid2name_dialog)
-       {
-               panel_pos = eX * 0.3 * vid_conwidth + eY * 0.1 * vid_conheight;
-               panel_size = eX * 0.4 * vid_conwidth + eY * 0.3 * vid_conheight;
-       }
-
-    // these must be below above block
-       vector pos, mySize;
-       pos = panel_pos;
-       mySize = panel_size;
-
-       a = vote_alpha * (vote_highlighted ? autocvar_hud_panel_vote_alreadyvoted_alpha : 1);
-       HUD_Panel_DrawBg(a);
-       a = panel_fg_alpha * a;
-
-       if(panel_bg_padding)
-       {
-               pos += '1 1 0' * panel_bg_padding;
-               mySize -= '2 2 0' * panel_bg_padding;
-       }
-
-       // always force 3:1 aspect
-       vector newSize = '0 0 0';
-       if(mySize.x/mySize.y > 3)
-       {
-               newSize.x = 3 * mySize.y;
-               newSize.y = mySize.y;
-
-               pos.x = pos.x + (mySize.x - newSize.x) / 2;
-       }
-       else
-       {
-               newSize.y = 1/3 * mySize.x;
-               newSize.x = mySize.x;
-
-               pos.y = pos.y + (mySize.y - newSize.y) / 2;
-       }
-       mySize = newSize;
-
-       s = _("A vote has been called for:");
-       if(uid2name_dialog)
-               s = _("Allow servers to store and display your name?");
-       drawstring_aspect(pos, s, eX * mySize.x + eY * (2/8) * mySize.y, '1 1 1', a, DRAWFLAG_NORMAL);
-       s = textShortenToWidth(vote_called_vote, mySize.x, '1 1 0' * mySize.y * (1/8), stringwidth_colors);
-       if(autocvar__hud_configure)
-               s = _("^1Configure the HUD");
-       drawcolorcodedstring_aspect(pos + eY * (2/8) * mySize.y, s, eX * mySize.x + eY * (1.75/8) * mySize.y, a, DRAWFLAG_NORMAL);
-
-       // print the yes/no counts
-    s = sprintf(_("Yes (%s): %d"), getcommandkey("vyes", "vyes"), vote_yescount);
-       drawstring_aspect(pos + eY * (4/8) * mySize.y, s, eX * 0.5 * mySize.x + eY * (1.5/8) * mySize.y, '0 1 0', a, DRAWFLAG_NORMAL);
-    s = sprintf(_("No (%s): %d"), getcommandkey("vno", "vno"), vote_nocount);
-       drawstring_aspect(pos + eX * 0.5 * mySize.x + eY * (4/8) * mySize.y, s, eX * 0.5 * mySize.x + eY * (1.5/8) * mySize.y, '1 0 0', a, DRAWFLAG_NORMAL);
-
-       // draw the progress bar backgrounds
-       drawpic_skin(pos + eY * (5/8) * mySize.y, "voteprogress_back", eX * mySize.x + eY * (3/8) * mySize.y, '1 1 1', a, DRAWFLAG_NORMAL);
-
-       // draw the highlights
-       if(vote_highlighted == 1) {
-               drawsetcliparea(pos.x, pos.y, mySize.x * 0.5, mySize.y);
-               drawpic_skin(pos + eY * (5/8) * mySize.y, "voteprogress_voted", eX * mySize.x + eY * (3/8) * mySize.y, '1 1 1', a, DRAWFLAG_NORMAL);
-       }
-       else if(vote_highlighted == -1) {
-               drawsetcliparea(pos.x + 0.5 * mySize.x, pos.y, mySize.x * 0.5, mySize.y);
-               drawpic_skin(pos + eY * (5/8) * mySize.y, "voteprogress_voted", eX * mySize.x + eY * (3/8) * mySize.y, '1 1 1', a, DRAWFLAG_NORMAL);
-       }
-
-       // draw the progress bars
-       if(vote_yescount && vote_needed)
-       {
-               drawsetcliparea(pos.x, pos.y, mySize.x * 0.5 * (vote_yescount/vote_needed), mySize.y);
-               drawpic_skin(pos + eY * (5/8) * mySize.y, "voteprogress_prog", eX * mySize.x + eY * (3/8) * mySize.y, '1 1 1', a, DRAWFLAG_NORMAL);
-       }
-
-       if(vote_nocount && vote_needed)
-       {
-               drawsetcliparea(pos.x + mySize.x - mySize.x * 0.5 * (vote_nocount/vote_needed), pos.y, mySize.x * 0.5, mySize.y);
-               drawpic_skin(pos + eY * (5/8) * mySize.y, "voteprogress_prog", eX * mySize.x + eY * (3/8) * mySize.y, '1 1 1', a, DRAWFLAG_NORMAL);
-       }
-
-       drawresetcliparea();
-}
-
-// Mod icons panel (#10)
-//
-
-bool mod_active; // is there any active mod icon?
-
-void DrawCAItem(vector myPos, vector mySize, float aspect_ratio, int layout, int i)
-{
-       int stat = -1;
-       string pic = "";
-       vector color = '0 0 0';
-       switch(i)
-       {
-               case 0:
-                       stat = getstati(STAT_REDALIVE);
-                       pic = "player_red.tga";
-                       color = '1 0 0';
-                       break;
-               case 1:
-                       stat = getstati(STAT_BLUEALIVE);
-                       pic = "player_blue.tga";
-                       color = '0 0 1';
-                       break;
-               case 2:
-                       stat = getstati(STAT_YELLOWALIVE);
-                       pic = "player_yellow.tga";
-                       color = '1 1 0';
-                       break;
-               default:
-               case 3:
-                       stat = getstati(STAT_PINKALIVE);
-                       pic = "player_pink.tga";
-                       color = '1 0 1';
-                       break;
-       }
-
-       if(mySize.x/mySize.y > aspect_ratio)
-       {
-               i = aspect_ratio * mySize.y;
-               myPos.x = myPos.x + (mySize.x - i) / 2;
-               mySize.x = i;
-       }
-       else
-       {
-               i = 1/aspect_ratio * mySize.x;
-               myPos.y = myPos.y + (mySize.y - i) / 2;
-               mySize.y = i;
-       }
-
-       if(layout)
-       {
-               drawpic_aspect_skin(myPos, pic, eX * 0.7 * mySize.x + eY * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-               drawstring_aspect(myPos + eX * 0.7 * mySize.x, ftos(stat), eX * 0.3 * mySize.x + eY * mySize.y, color, panel_fg_alpha, DRAWFLAG_NORMAL);
-       }
-       else
-               drawstring_aspect(myPos, ftos(stat), mySize, color, panel_fg_alpha, DRAWFLAG_NORMAL);
-}
-
-// Clan Arena and Freeze Tag HUD modicons
-void HUD_Mod_CA(vector myPos, vector mySize)
-{
-       mod_active = 1; // required in each mod function that always shows something
-
-       int layout;
-       if(gametype == MAPINFO_TYPE_CA)
-               layout = autocvar_hud_panel_modicons_ca_layout;
-       else //if(gametype == MAPINFO_TYPE_FREEZETAG)
-               layout = autocvar_hud_panel_modicons_freezetag_layout;
-       int rows, columns;
-       float aspect_ratio;
-       aspect_ratio = (layout) ? 2 : 1;
-       rows = HUD_GetRowCount(team_count, mySize, aspect_ratio);
-       columns = ceil(team_count/rows);
-
-       int i;
-       float row = 0, column = 0;
-       vector pos, itemSize;
-       itemSize = eX * mySize.x*(1/columns) + eY * mySize.y*(1/rows);
-       for(i=0; i<team_count; ++i)
-       {
-               pos = myPos + eX * column * itemSize.x + eY * row * itemSize.y;
-
-               DrawCAItem(pos, itemSize, aspect_ratio, layout, i);
-
-               ++row;
-               if(row >= rows)
-               {
-                       row = 0;
-                       ++column;
-               }
-       }
-}
-
-// CTF HUD modicon section
-int redflag_prevframe, blueflag_prevframe, yellowflag_prevframe, pinkflag_prevframe, neutralflag_prevframe; // status during previous frame
-int redflag_prevstatus, blueflag_prevstatus, yellowflag_prevstatus, pinkflag_prevstatus, neutralflag_prevstatus; // last remembered status
-float redflag_statuschange_time, blueflag_statuschange_time, yellowflag_statuschange_time, pinkflag_statuschange_time, neutralflag_statuschange_time; // time when the status changed
-
-void HUD_Mod_CTF_Reset()
-{
-       redflag_prevstatus = blueflag_prevstatus = yellowflag_prevstatus = pinkflag_prevstatus = neutralflag_prevstatus = 0;
-       redflag_prevframe = blueflag_prevframe = yellowflag_prevframe = pinkflag_prevframe = neutralflag_prevframe = 0;
-       redflag_statuschange_time = blueflag_statuschange_time = yellowflag_statuschange_time = pinkflag_statuschange_time = neutralflag_statuschange_time = 0;
-}
-
-void HUD_Mod_CTF(vector pos, vector mySize)
-{
-       vector redflag_pos, blueflag_pos, yellowflag_pos, pinkflag_pos, neutralflag_pos;
-       vector flag_size;
-       float f; // every function should have that
-
-       int redflag, blueflag, yellowflag, pinkflag, neutralflag; // current status
-       float redflag_statuschange_elapsedtime, blueflag_statuschange_elapsedtime, yellowflag_statuschange_elapsedtime, pinkflag_statuschange_elapsedtime, neutralflag_statuschange_elapsedtime; // time since the status changed
-       bool ctf_oneflag; // one-flag CTF mode enabled/disabled
-       int stat_items = getstati(STAT_CTF_FLAGSTATUS, 0, 24);
-       float fs, fs2, fs3, size1, size2;
-       vector e1, e2;
-
-       redflag = (stat_items/CTF_RED_FLAG_TAKEN) & 3;
-       blueflag = (stat_items/CTF_BLUE_FLAG_TAKEN) & 3;
-       yellowflag = (stat_items/CTF_YELLOW_FLAG_TAKEN) & 3;
-       pinkflag = (stat_items/CTF_PINK_FLAG_TAKEN) & 3;
-       neutralflag = (stat_items/CTF_NEUTRAL_FLAG_TAKEN) & 3;
-
-       ctf_oneflag = (stat_items & CTF_FLAG_NEUTRAL);
-
-       mod_active = (redflag || blueflag || yellowflag || pinkflag || neutralflag);
-
-       if (autocvar__hud_configure) {
-               redflag = 1;
-               blueflag = 2;
-               if (team_count >= 3)
-                       yellowflag = 2;
-               if (team_count >= 4)
-                       pinkflag = 3;
-               ctf_oneflag = neutralflag = 0; // disable neutral flag in hud editor?
-       }
-
-       // when status CHANGES, set old status into prevstatus and current status into status
-       #define X(team) do {                                                                                                                    \
-               if (team##flag != team##flag_prevframe) {                                                                       \
-               team##flag_statuschange_time = time;                                                                    \
-               team##flag_prevstatus = team##flag_prevframe;                                                   \
-               team##flag_prevframe = team##flag;                                                                              \
-       }                                                                                                                                                       \
-       team##flag_statuschange_elapsedtime = time - team##flag_statuschange_time;      \
-    } while (0)
-       X(red);
-       X(blue);
-       X(yellow);
-       X(pink);
-       X(neutral);
-       #undef X
-
-       const float BLINK_FACTOR = 0.15;
-       const float BLINK_BASE = 0.85;
-       // note:
-       //   RMS = sqrt(BLINK_BASE^2 + 0.5 * BLINK_FACTOR^2)
-       // thus
-       //   BLINK_BASE = sqrt(RMS^2 - 0.5 * BLINK_FACTOR^2)
-       // ensure RMS == 1
-       const float BLINK_FREQ = 5; // circle frequency, = 2*pi*frequency in hertz
-
-       #define X(team, cond) \
-       string team##_icon, team##_icon_prevstatus; \
-       int team##_alpha, team##_alpha_prevstatus; \
-       team##_alpha = team##_alpha_prevstatus = 1; \
-       do { \
-               switch (team##flag) { \
-                       case 1: team##_icon = "flag_" #team "_taken"; break; \
-                       case 2: team##_icon = "flag_" #team "_lost"; break; \
-                       case 3: team##_icon = "flag_" #team "_carrying"; team##_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; \
-                       default: \
-                               if ((stat_items & CTF_SHIELDED) && (cond)) { \
-                                       team##_icon = "flag_" #team "_shielded"; \
-                               } else { \
-                                       team##_icon = string_null; \
-                               } \
-                               break; \
-               } \
-               switch (team##flag_prevstatus) { \
-                       case 1: team##_icon_prevstatus = "flag_" #team "_taken"; break; \
-                       case 2: team##_icon_prevstatus = "flag_" #team "_lost"; break; \
-                       case 3: team##_icon_prevstatus = "flag_" #team "_carrying"; team##_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break; \
-                       default: \
-                               if (team##flag == 3) { \
-                                       team##_icon_prevstatus = "flag_" #team "_carrying"; /* make it more visible */\
-                               } else if((stat_items & CTF_SHIELDED) && (cond)) { \
-                                       team##_icon_prevstatus = "flag_" #team "_shielded"; \
-                               } else { \
-                                       team##_icon_prevstatus = string_null; \
-                               } \
-                               break; \
-               } \
-       } while (0)
-       X(red, myteam != NUM_TEAM_1);
-       X(blue, myteam != NUM_TEAM_2);
-       X(yellow, myteam != NUM_TEAM_3);
-       X(pink, myteam != NUM_TEAM_4);
-       X(neutral, true);
-       #undef X
-
-       if (ctf_oneflag) {
-               // hacky, but these aren't needed
-               red_icon = red_icon_prevstatus = blue_icon = blue_icon_prevstatus = yellow_icon = yellow_icon_prevstatus = pink_icon = pink_icon_prevstatus = string_null;
-               fs = fs2 = fs3 = 1;
-       } else switch (team_count) {
-               default:
-               case 2: fs = 0.5; fs2 = 0.5; fs3 = 0.5; break;
-               case 3: fs = 1; fs2 = 0.35; fs3 = 0.35; break;
-               case 4: fs = 0.75; fs2 = 0.25; fs3 = 0.5; break;
-       }
-
-       if (mySize_x > mySize_y) {
-               size1 = mySize_x;
-               size2 = mySize_y;
-               e1 = eX;
-               e2 = eY;
-       } else {
-               size1 = mySize_y;
-               size2 = mySize_x;
-               e1 = eY;
-               e2 = eX;
-       }
-
-       switch (myteam) {
-               default:
-               case NUM_TEAM_1: {
-                       redflag_pos = pos;
-                       blueflag_pos = pos + eX * fs2 * size1;
-                       yellowflag_pos = pos - eX * fs2 * size1;
-                       pinkflag_pos = pos + eX * fs3 * size1;
-                       break;
-               }
-               case NUM_TEAM_2: {
-                       redflag_pos = pos + eX * fs2 * size1;
-                       blueflag_pos = pos;
-                       yellowflag_pos = pos - eX * fs2 * size1;
-                       pinkflag_pos = pos + eX * fs3 * size1;
-                       break;
-               }
-               case NUM_TEAM_3: {
-                       redflag_pos = pos + eX * fs3 * size1;
-                       blueflag_pos = pos - eX * fs2 * size1;
-                       yellowflag_pos = pos;
-                       pinkflag_pos = pos + eX * fs2 * size1;
-                       break;
-               }
-               case NUM_TEAM_4: {
-                       redflag_pos = pos - eX * fs2 * size1;
-                       blueflag_pos = pos + eX * fs3 * size1;
-                       yellowflag_pos = pos + eX * fs2 * size1;
-                       pinkflag_pos = pos;
-                       break;
-               }
-       }
-       neutralflag_pos = pos;
-       flag_size = e1 * fs * size1 + e2 * size2;
-
-       #define X(team) do { \
-               f = bound(0, team##flag_statuschange_elapsedtime * 2, 1); \
-               if (team##_icon_prevstatus && f < 1) \
-                       drawpic_aspect_skin_expanding(team##flag_pos, team##_icon_prevstatus, flag_size, '1 1 1', panel_fg_alpha * team##_alpha_prevstatus, DRAWFLAG_NORMAL, f); \
-               if (team##_icon) \
-                       drawpic_aspect_skin(team##flag_pos, team##_icon, flag_size, '1 1 1', panel_fg_alpha * team##_alpha * f, DRAWFLAG_NORMAL); \
-       } while (0)
-       X(red);
-       X(blue);
-       X(yellow);
-       X(pink);
-       X(neutral);
-       #undef X
-}
-
-// Keyhunt HUD modicon section
-vector KH_SLOTS[4];
-
-void HUD_Mod_KH(vector pos, vector mySize)
-{
-       mod_active = 1; // keyhunt should never hide the mod icons panel
-
-       // Read current state
-
-       int state = getstati(STAT_KH_KEYS);
-       int i, key_state;
-       int all_keys, team1_keys, team2_keys, team3_keys, team4_keys, dropped_keys, carrying_keys;
-       all_keys = team1_keys = team2_keys = team3_keys = team4_keys = dropped_keys = carrying_keys = 0;
-
-       for(i = 0; i < 4; ++i)
-       {
-               key_state = (bitshift(state, i * -5) & 31) - 1;
-
-               if(key_state == -1)
-                       continue;
-
-               if(key_state == 30)
-               {
-                       ++carrying_keys;
-                       key_state = myteam;
-               }
-
-               switch(key_state)
-               {
-                       case NUM_TEAM_1: ++team1_keys; break;
-                       case NUM_TEAM_2: ++team2_keys; break;
-                       case NUM_TEAM_3: ++team3_keys; break;
-                       case NUM_TEAM_4: ++team4_keys; break;
-                       case 29: ++dropped_keys; break;
-               }
-
-               ++all_keys;
-       }
-
-       // Calculate slot measurements
-
-       vector slot_size;
-
-       if(all_keys == 4 && mySize.x * 0.5 < mySize.y && mySize.y * 0.5 < mySize.x)
-       {
-               // Quadratic arrangement
-               slot_size = eX * mySize.x * 0.5 + eY * mySize.y * 0.5;
-               KH_SLOTS[0] = pos;
-               KH_SLOTS[1] = pos + eX * slot_size.x;
-               KH_SLOTS[2] = pos + eY * slot_size.y;
-               KH_SLOTS[3] = pos + eX * slot_size.x + eY * slot_size.y;
-       }
-       else
-       {
-               if(mySize.x > mySize.y)
-               {
-                       // Horizontal arrangement
-                       slot_size = eX * mySize.x / all_keys + eY * mySize.y;
-                       for(i = 0; i < all_keys; ++i)
-                               KH_SLOTS[i] = pos + eX * slot_size.x * i;
-               }
-               else
-               {
-                       // Vertical arrangement
-                       slot_size = eX * mySize.x + eY * mySize.y / all_keys;
-                       for(i = 0; i < all_keys; ++i)
-                               KH_SLOTS[i] = pos + eY * slot_size.y * i;
-               }
-       }
-
-       // Make icons blink in case of RUN HERE
-
-       float blink = 0.6 + sin(2*M_PI*time) / 2.5; // Oscillate between 0.2 and 1
-       float alpha;
-       alpha = 1;
-
-       if(carrying_keys)
-               switch(myteam)
-               {
-                       case NUM_TEAM_1: if(team1_keys == all_keys) alpha = blink; break;
-                       case NUM_TEAM_2: if(team2_keys == all_keys) alpha = blink; break;
-                       case NUM_TEAM_3: if(team3_keys == all_keys) alpha = blink; break;
-                       case NUM_TEAM_4: if(team4_keys == all_keys) alpha = blink; break;
-               }
-
-       // Draw icons
-
-       i = 0;
-
-       while(team1_keys--)
-               if(myteam == NUM_TEAM_1 && carrying_keys)
-               {
-                       drawpic_aspect_skin(KH_SLOTS[i++], "kh_red_carrying", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
-                       --carrying_keys;
-               }
-               else
-                       drawpic_aspect_skin(KH_SLOTS[i++], "kh_red_taken", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
-
-       while(team2_keys--)
-               if(myteam == NUM_TEAM_2 && carrying_keys)
-               {
-                       drawpic_aspect_skin(KH_SLOTS[i++], "kh_blue_carrying", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
-                       --carrying_keys;
-               }
-               else
-                       drawpic_aspect_skin(KH_SLOTS[i++], "kh_blue_taken", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
-
-       while(team3_keys--)
-               if(myteam == NUM_TEAM_3 && carrying_keys)
-               {
-                       drawpic_aspect_skin(KH_SLOTS[i++], "kh_yellow_carrying", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
-                       --carrying_keys;
-               }
-               else
-                       drawpic_aspect_skin(KH_SLOTS[i++], "kh_yellow_taken", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
-
-       while(team4_keys--)
-               if(myteam == NUM_TEAM_4 && carrying_keys)
-               {
-                       drawpic_aspect_skin(KH_SLOTS[i++], "kh_pink_carrying", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
-                       --carrying_keys;
-               }
-               else
-                       drawpic_aspect_skin(KH_SLOTS[i++], "kh_pink_taken", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
-
-       while(dropped_keys--)
-               drawpic_aspect_skin(KH_SLOTS[i++], "kh_dropped", slot_size, '1 1 1', alpha, DRAWFLAG_NORMAL);
-}
-
-// Keepaway HUD mod icon
-int kaball_prevstatus; // last remembered status
-float kaball_statuschange_time; // time when the status changed
-
-// we don't need to reset for keepaway since it immediately
-// autocorrects prevstatus as to if the player has the ball or not
-
-void HUD_Mod_Keepaway(vector pos, vector mySize)
-{
-       mod_active = 1; // keepaway should always show the mod HUD
-
-       float BLINK_FACTOR = 0.15;
-       float BLINK_BASE = 0.85;
-       float BLINK_FREQ = 5;
-       float kaball_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ);
-
-       int stat_items = getstati(STAT_ITEMS, 0, 24);
-       int kaball = (stat_items/IT_KEY1) & 1;
-
-       if(kaball != kaball_prevstatus)
-       {
-               kaball_statuschange_time = time;
-               kaball_prevstatus = kaball;
-       }
-
-       vector kaball_pos, kaball_size;
-
-       if(mySize.x > mySize.y) {
-               kaball_pos = pos + eX * 0.25 * mySize.x;
-               kaball_size = eX * 0.5 * mySize.x + eY * mySize.y;
-       } else {
-               kaball_pos = pos + eY * 0.25 * mySize.y;
-               kaball_size = eY * 0.5 * mySize.y + eX * mySize.x;
-       }
-
-       float kaball_statuschange_elapsedtime = time - kaball_statuschange_time;
-       float f = bound(0, kaball_statuschange_elapsedtime*2, 1);
-
-       if(kaball_prevstatus && f < 1)
-               drawpic_aspect_skin_expanding(kaball_pos, "keepawayball_carrying", kaball_size, '1 1 1', panel_fg_alpha * kaball_alpha, DRAWFLAG_NORMAL, f);
-
-       if(kaball)
-               drawpic_aspect_skin(pos, "keepawayball_carrying", eX * mySize.x + eY * mySize.y, '1 1 1', panel_fg_alpha * kaball_alpha * f, DRAWFLAG_NORMAL);
-}
-
-
-// Nexball HUD mod icon
-void HUD_Mod_NexBall(vector pos, vector mySize)
-{
-       float nb_pb_starttime, dt, p;
-       int stat_items;
-
-       stat_items = getstati(STAT_ITEMS, 0, 24);
-       nb_pb_starttime = getstatf(STAT_NB_METERSTART);
-
-       if (stat_items & IT_KEY1)
-               mod_active = 1;
-       else
-               mod_active = 0;
-
-       //Manage the progress bar if any
-       if (nb_pb_starttime > 0)
-       {
-               dt = (time - nb_pb_starttime) % nb_pb_period;
-               // one period of positive triangle
-               p = 2 * dt / nb_pb_period;
-               if (p > 1)
-                       p = 2 - p;
-
-               HUD_Panel_DrawProgressBar(pos, mySize, "progressbar", p, (mySize.x <= mySize.y), 0, autocvar_hud_progressbar_nexball_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
-       }
-
-       if (stat_items & IT_KEY1)
-               drawpic_aspect_skin(pos, "nexball_carrying", eX * mySize.x + eY * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-}
-
-// Race/CTS HUD mod icons
-float crecordtime_prev; // last remembered crecordtime
-float crecordtime_change_time; // time when crecordtime last changed
-float srecordtime_prev; // last remembered srecordtime
-float srecordtime_change_time; // time when srecordtime last changed
-
-float race_status_time;
-int race_status_prev;
-string race_status_name_prev;
-void HUD_Mod_Race(vector pos, vector mySize)
-{
-       mod_active = 1; // race should never hide the mod icons panel
-       entity me;
-       me = playerslots[player_localnum];
-       float t, score;
-       float f; // yet another function has this
-       score = me.(scores[ps_primary]);
-
-       if(!(scores_flags[ps_primary] & SFL_TIME) || teamplay) // race/cts record display on HUD
-               return; // no records in the actual race
-
-       // clientside personal record
-       string rr;
-       if(gametype == MAPINFO_TYPE_CTS)
-               rr = CTS_RECORD;
-       else
-               rr = RACE_RECORD;
-       t = stof(db_get(ClientProgsDB, strcat(shortmapname, rr, "time")));
-
-       if(score && (score < t || !t)) {
-               db_put(ClientProgsDB, strcat(shortmapname, rr, "time"), ftos(score));
-               if(autocvar_cl_autodemo_delete_keeprecords)
-               {
-                       f = autocvar_cl_autodemo_delete;
-                       f &= ~1;
-                       cvar_set("cl_autodemo_delete", ftos(f)); // don't delete demo with new record!
-               }
-       }
-
-       if(t != crecordtime_prev) {
-               crecordtime_prev = t;
-               crecordtime_change_time = time;
-       }
-
-       vector textPos, medalPos;
-       float squareSize;
-       if(mySize.x > mySize.y) {
-               // text on left side
-               squareSize = min(mySize.y, mySize.x/2);
-               textPos = pos + eX * 0.5 * max(0, mySize.x/2 - squareSize) + eY * 0.5 * (mySize.y - squareSize);
-               medalPos = pos + eX * 0.5 * max(0, mySize.x/2 - squareSize) + eX * 0.5 * mySize.x + eY * 0.5 * (mySize.y - squareSize);
-       } else {
-               // text on top
-               squareSize = min(mySize.x, mySize.y/2);
-               textPos = pos + eY * 0.5 * max(0, mySize.y/2 - squareSize) + eX * 0.5 * (mySize.x - squareSize);
-               medalPos = pos + eY * 0.5 * max(0, mySize.y/2 - squareSize) + eY * 0.5 * mySize.y + eX * 0.5 * (mySize.x - squareSize);
-       }
-
-       f = time - crecordtime_change_time;
-
-       if (f > 1) {
-               drawstring_aspect(textPos, _("Personal best"), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-               drawstring_aspect(textPos + eY * 0.25 * squareSize, TIME_ENCODED_TOSTRING(t), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-       } else {
-               drawstring_aspect(textPos, _("Personal best"), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-               drawstring_aspect(textPos + eY * 0.25 * squareSize, TIME_ENCODED_TOSTRING(t), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-               drawstring_aspect_expanding(pos, _("Personal best"), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f);
-               drawstring_aspect_expanding(pos + eY * 0.25 * squareSize, TIME_ENCODED_TOSTRING(t), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f);
-       }
-
-       // server record
-       t = race_server_record;
-       if(t != srecordtime_prev) {
-               srecordtime_prev = t;
-               srecordtime_change_time = time;
-       }
-       f = time - srecordtime_change_time;
-
-       if (f > 1) {
-               drawstring_aspect(textPos + eY * 0.5 * squareSize, _("Server best"), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-               drawstring_aspect(textPos + eY * 0.75 * squareSize, TIME_ENCODED_TOSTRING(t), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-       } else {
-               drawstring_aspect(textPos + eY * 0.5 * squareSize, _("Server best"), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-               drawstring_aspect(textPos + eY * 0.75 * squareSize, TIME_ENCODED_TOSTRING(t), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-               drawstring_aspect_expanding(textPos + eY * 0.5 * squareSize, _("Server best"), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f);
-               drawstring_aspect_expanding(textPos + eY * 0.75 * squareSize, TIME_ENCODED_TOSTRING(t), eX * squareSize + eY * 0.25 * squareSize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, f);
-       }
-
-       if (race_status != race_status_prev || race_status_name != race_status_name_prev) {
-               race_status_time = time + 5;
-               race_status_prev = race_status;
-               if (race_status_name_prev)
-                       strunzone(race_status_name_prev);
-               race_status_name_prev = strzone(race_status_name);
-       }
-
-       // race "awards"
-       float a;
-       a = bound(0, race_status_time - time, 1);
-
-       string s;
-       s = textShortenToWidth(race_status_name, squareSize, '1 1 0' * 0.1 * squareSize, stringwidth_colors);
-
-       float rank;
-       if(race_status > 0)
-               rank = race_CheckName(race_status_name);
-       else
-               rank = 0;
-       string rankname;
-       rankname = count_ordinal(rank);
-
-       vector namepos;
-       namepos = medalPos + '0 0.8 0' * squareSize;
-       vector rankpos;
-       rankpos = medalPos + '0 0.15 0' * squareSize;
-
-       if(race_status == 0)
-               drawpic_aspect_skin(medalPos, "race_newfail", '1 1 0' * squareSize, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
-       else if(race_status == 1) {
-               drawpic_aspect_skin(medalPos + '0.1 0 0' * squareSize, "race_newtime", '1 1 0' * 0.8 * squareSize, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
-               drawcolorcodedstring_aspect(namepos, s, '1 0.2 0' * squareSize, panel_fg_alpha * a, DRAWFLAG_NORMAL);
-               drawstring_aspect(rankpos, rankname, '1 0.15 0' * squareSize, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
-       } else if(race_status == 2) {
-               if(race_status_name == GetPlayerName(player_localnum) || !race_myrank || race_myrank < rank)
-                       drawpic_aspect_skin(medalPos + '0.1 0 0' * squareSize, "race_newrankgreen", '1 1 0' * 0.8 * squareSize, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
-               else
-                       drawpic_aspect_skin(medalPos + '0.1 0 0' * squareSize, "race_newrankyellow", '1 1 0' * 0.8 * squareSize, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
-               drawcolorcodedstring_aspect(namepos, s, '1 0.2 0' * squareSize, panel_fg_alpha * a, DRAWFLAG_NORMAL);
-               drawstring_aspect(rankpos, rankname, '1 0.15 0' * squareSize, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
-       } else if(race_status == 3) {
-               drawpic_aspect_skin(medalPos + '0.1 0 0' * squareSize, "race_newrecordserver", '1 1 0' * 0.8 * squareSize, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
-               drawcolorcodedstring_aspect(namepos, s, '1 0.2 0' * squareSize, panel_fg_alpha * a, DRAWFLAG_NORMAL);
-               drawstring_aspect(rankpos, rankname, '1 0.15 0' * squareSize, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL);
-       }
-
-       if (race_status_time - time <= 0) {
-               race_status_prev = -1;
-               race_status = -1;
-               if(race_status_name)
-                       strunzone(race_status_name);
-               race_status_name = string_null;
-               if(race_status_name_prev)
-                       strunzone(race_status_name_prev);
-               race_status_name_prev = string_null;
-       }
-}
-
-void DrawDomItem(vector myPos, vector mySize, float aspect_ratio, int layout, int i)
-{
-       float stat = -1;
-       string pic = "";
-       vector color = '0 0 0';
-       switch(i)
-       {
-               case 0:
-                       stat = getstatf(STAT_DOM_PPS_RED);
-                       pic = "dom_icon_red";
-                       color = '1 0 0';
-                       break;
-               case 1:
-                       stat = getstatf(STAT_DOM_PPS_BLUE);
-                       pic = "dom_icon_blue";
-                       color = '0 0 1';
-                       break;
-               case 2:
-                       stat = getstatf(STAT_DOM_PPS_YELLOW);
-                       pic = "dom_icon_yellow";
-                       color = '1 1 0';
-                       break;
-               default:
-               case 3:
-                       stat = getstatf(STAT_DOM_PPS_PINK);
-                       pic = "dom_icon_pink";
-                       color = '1 0 1';
-                       break;
-       }
-       float pps_ratio = stat / getstatf(STAT_DOM_TOTAL_PPS);
-
-       if(mySize.x/mySize.y > aspect_ratio)
-       {
-               i = aspect_ratio * mySize.y;
-               myPos.x = myPos.x + (mySize.x - i) / 2;
-               mySize.x = i;
-       }
-       else
-       {
-               i = 1/aspect_ratio * mySize.x;
-               myPos.y = myPos.y + (mySize.y - i) / 2;
-               mySize.y = i;
-       }
-
-       if (layout) // show text too
-       {
-               //draw the text
-               color *= 0.5 + pps_ratio * (1 - 0.5); // half saturated color at min, full saturated at max
-               if (layout == 2) // average pps
-                       drawstring_aspect(myPos + eX * mySize.y, ftos_decimals(stat, 2), eX * (2/3) * mySize.x + eY * mySize.y, color, panel_fg_alpha, DRAWFLAG_NORMAL);
-               else // percentage of average pps
-                       drawstring_aspect(myPos + eX * mySize.y, strcat( ftos(floor(pps_ratio*100 + 0.5)), "%" ), eX * (2/3) * mySize.x + eY * mySize.y, color, panel_fg_alpha, DRAWFLAG_NORMAL);
-       }
-
-       //draw the icon
-       drawpic_aspect_skin(myPos, pic, '1 1 0' * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-       if (stat > 0)
-       {
-               drawsetcliparea(myPos.x, myPos.y + mySize.y * (1 - pps_ratio), mySize.y, mySize.y * pps_ratio);
-               drawpic_aspect_skin(myPos, strcat(pic, "-highlighted"), '1 1 0' * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-               drawresetcliparea();
-       }
-}
-
-void HUD_Mod_Dom(vector myPos, vector mySize)
-{
-       mod_active = 1; // required in each mod function that always shows something
-
-       int layout = autocvar_hud_panel_modicons_dom_layout;
-       int rows, columns;
-       float aspect_ratio;
-       aspect_ratio = (layout) ? 3 : 1;
-       rows = HUD_GetRowCount(team_count, mySize, aspect_ratio);
-       columns = ceil(team_count/rows);
-
-       int i;
-       float row = 0, column = 0;
-       vector pos, itemSize;
-       itemSize = eX * mySize.x*(1/columns) + eY * mySize.y*(1/rows);
-       for(i=0; i<team_count; ++i)
-       {
-               pos = myPos + eX * column * itemSize.x + eY * row * itemSize.y;
-
-               DrawDomItem(pos, itemSize, aspect_ratio, layout, i);
-
-               ++row;
-               if(row >= rows)
-               {
-                       row = 0;
-                       ++column;
-               }
-       }
-}
-
-void HUD_ModIcons_SetFunc()
-{
-       switch(gametype)
-       {
-               case MAPINFO_TYPE_KEYHUNT:              HUD_ModIcons_GameType = HUD_Mod_KH; break;
-               case MAPINFO_TYPE_CTF:                  HUD_ModIcons_GameType = HUD_Mod_CTF; break;
-               case MAPINFO_TYPE_NEXBALL:              HUD_ModIcons_GameType = HUD_Mod_NexBall; break;
-               case MAPINFO_TYPE_CTS:
-               case MAPINFO_TYPE_RACE:         HUD_ModIcons_GameType = HUD_Mod_Race; break;
-               case MAPINFO_TYPE_CA:
-               case MAPINFO_TYPE_FREEZETAG:    HUD_ModIcons_GameType = HUD_Mod_CA; break;
-               case MAPINFO_TYPE_DOMINATION:   HUD_ModIcons_GameType = HUD_Mod_Dom; break;
-               case MAPINFO_TYPE_KEEPAWAY:     HUD_ModIcons_GameType = HUD_Mod_Keepaway; break;
-       }
-}
-
-int mod_prev; // previous state of mod_active to check for a change
-float mod_alpha;
-float mod_change; // "time" when mod_active changed
-
-void HUD_ModIcons()
-{
-       if(!autocvar__hud_configure)
-       {
-               if(!autocvar_hud_panel_modicons) return;
-               if(!HUD_ModIcons_GameType) return;
-       }
-
-       HUD_Panel_UpdateCvars();
-
-       draw_beginBoldFont();
-
-       if(mod_active != mod_prev) {
-               mod_change = time;
-               mod_prev = mod_active;
-       }
-
-       if(mod_active || autocvar__hud_configure)
-               mod_alpha = bound(0, (time - mod_change) * 2, 1);
-       else
-               mod_alpha = bound(0, 1 - (time - mod_change) * 2, 1);
-
-       if(mod_alpha)
-               HUD_Panel_DrawBg(mod_alpha);
-
-       if(panel_bg_padding)
-       {
-               panel_pos += '1 1 0' * panel_bg_padding;
-               panel_size -= '2 2 0' * panel_bg_padding;
-       }
-
-       if(autocvar__hud_configure)
-               HUD_Mod_CTF(panel_pos, panel_size);
-       else
-               HUD_ModIcons_GameType(panel_pos, panel_size);
-
-       draw_endBoldFont();
-}
-
-// Draw pressed keys (#11)
-//
-void HUD_PressedKeys()
-{
-       if(!autocvar__hud_configure)
-       {
-               if(!autocvar_hud_panel_pressedkeys) return;
-               if(spectatee_status <= 0 && autocvar_hud_panel_pressedkeys < 2) return;
-       }
-
-       HUD_Panel_UpdateCvars();
-       vector pos, mySize;
-       pos = panel_pos;
-       mySize = panel_size;
-
-       HUD_Panel_DrawBg(1);
-       if(panel_bg_padding)
-       {
-               pos += '1 1 0' * panel_bg_padding;
-               mySize -= '2 2 0' * panel_bg_padding;
-       }
-
-       // force custom aspect
-       float aspect = autocvar_hud_panel_pressedkeys_aspect;
-       if(aspect)
-       {
-               vector newSize = '0 0 0';
-               if(mySize.x/mySize.y > aspect)
-               {
-                       newSize.x = aspect * mySize.y;
-                       newSize.y = mySize.y;
-
-                       pos.x = pos.x + (mySize.x - newSize.x) / 2;
-               }
-               else
-               {
-                       newSize.y = 1/aspect * mySize.x;
-                       newSize.x = mySize.x;
-
-                       pos.y = pos.y + (mySize.y - newSize.y) / 2;
-               }
-               mySize = newSize;
-       }
-
-       vector keysize;
-       keysize = eX * mySize.x * (1/3.0) + eY * mySize.y * (1/(3.0 - !autocvar_hud_panel_pressedkeys_attack));
-       float pressedkeys;
-       pressedkeys = getstatf(STAT_PRESSED_KEYS);
-
-       if(autocvar_hud_panel_pressedkeys_attack)
-       {
-               drawpic_aspect_skin(pos + eX * keysize.x * 0.5, ((pressedkeys & KEY_ATCK) ? "key_atck_inv.tga" : "key_atck.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-               drawpic_aspect_skin(pos + eX * keysize.x * 1.5, ((pressedkeys & KEY_ATCK2) ? "key_atck_inv.tga" : "key_atck.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-               pos.y += keysize.y;
-       }
-
-       drawpic_aspect_skin(pos, ((pressedkeys & KEY_CROUCH) ? "key_crouch_inv.tga" : "key_crouch.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-       drawpic_aspect_skin(pos + eX * keysize.x, ((pressedkeys & KEY_FORWARD) ? "key_forward_inv.tga" : "key_forward.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-       drawpic_aspect_skin(pos + eX * keysize.x * 2, ((pressedkeys & KEY_JUMP) ? "key_jump_inv.tga" : "key_jump.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-       pos.y += keysize.y;
-       drawpic_aspect_skin(pos, ((pressedkeys & KEY_LEFT) ? "key_left_inv.tga" : "key_left.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-       drawpic_aspect_skin(pos + eX * keysize.x, ((pressedkeys & KEY_BACKWARD) ? "key_backward_inv.tga" : "key_backward.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-       drawpic_aspect_skin(pos + eX * keysize.x * 2, ((pressedkeys & KEY_RIGHT) ? "key_right_inv.tga" : "key_right.tga"), keysize, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-}
-
-// Handle chat as a panel (#12)
-//
-void HUD_Chat()
-{
-       if(!autocvar__hud_configure)
-       {
-               if (!autocvar_hud_panel_chat)
-               {
-                       if (!autocvar_con_chatrect)
-                               cvar_set("con_chatrect", "0");
-                       return;
-               }
-               if(autocvar__con_chat_maximized)
-               {
-                       if(!hud_draw_maximized) return;
-               }
-               else if(chat_panel_modified)
-               {
-                       panel.update_time = time; // forces reload of panel attributes
-                       chat_panel_modified = false;
-               }
-       }
-
-       HUD_Panel_UpdateCvars();
-
-       if(intermission == 2)
-       {
-               // reserve some more space to the mapvote panel
-               // by resizing and moving chat panel to the bottom
-               panel_size.y = min(panel_size.y, vid_conheight * 0.2);
-               panel_pos.y = vid_conheight - panel_size.y - panel_bg_border * 2;
-               chat_posy = panel_pos.y;
-               chat_sizey = panel_size.y;
-       }
-       if(autocvar__con_chat_maximized && !autocvar__hud_configure) // draw at full screen height if maximized
-       {
-               panel_pos.y = panel_bg_border;
-               panel_size.y = vid_conheight - panel_bg_border * 2;
-               if(panel.current_panel_bg == "0") // force a border when maximized
-               {
-                       string panel_bg;
-                       panel_bg = strcat(hud_skin_path, "/border_default");
-                       if(precache_pic(panel_bg) == "")
-                               panel_bg = "gfx/hud/default/border_default";
-                       if(panel.current_panel_bg)
-                               strunzone(panel.current_panel_bg);
-                       panel.current_panel_bg = strzone(panel_bg);
-                       chat_panel_modified = true;
-               }
-               panel_bg_alpha = max(0.75, panel_bg_alpha); // force an theAlpha of at least 0.75
-       }
-
-       vector pos, mySize;
-       pos = panel_pos;
-       mySize = panel_size;
-
-       HUD_Panel_DrawBg(1);
-
-       if(panel_bg_padding)
-       {
-               pos += '1 1 0' * panel_bg_padding;
-               mySize -= '2 2 0' * panel_bg_padding;
-       }
-
-       if (!autocvar_con_chatrect)
-               cvar_set("con_chatrect", "1");
-
-       cvar_set("con_chatrect_x", ftos(pos.x/vid_conwidth));
-       cvar_set("con_chatrect_y", ftos(pos.y/vid_conheight));
-
-       cvar_set("con_chatwidth", ftos(mySize.x/vid_conwidth));
-       cvar_set("con_chat", ftos(floor(mySize.y/autocvar_con_chatsize - 0.5)));
-
-       if(autocvar__hud_configure)
-       {
-               vector chatsize;
-               chatsize = '1 1 0' * autocvar_con_chatsize;
-               cvar_set("con_chatrect_x", "9001"); // over 9000, we'll fake it instead for more control over theAlpha and such
-               float i, a;
-               for(i = 0; i < autocvar_con_chat; ++i)
-               {
-                       if(i == autocvar_con_chat - 1)
-                               a = panel_fg_alpha;
-                       else
-                               a = panel_fg_alpha * floor(((i + 1) * 7 + autocvar_con_chattime)/45);
-                       drawcolorcodedstring(pos, textShortenToWidth(_("^3Player^7: This is the chat area."), mySize.x, chatsize, stringwidth_colors), chatsize, a, DRAWFLAG_NORMAL);
-                       pos.y += chatsize.y;
-               }
-       }
-}
-
-// Engine info panel (#13)
-//
-float prevfps;
-float prevfps_time;
-int framecounter;
-
-float frametimeavg;
-float frametimeavg1; // 1 frame ago
-float frametimeavg2; // 2 frames ago
-void HUD_EngineInfo()
-{
-       if(!autocvar__hud_configure)
-       {
-               if(!autocvar_hud_panel_engineinfo) return;
-       }
-
-       HUD_Panel_UpdateCvars();
-       vector pos, mySize;
-       pos = panel_pos;
-       mySize = panel_size;
-
-       HUD_Panel_DrawBg(1);
-       if(panel_bg_padding)
-       {
-               pos += '1 1 0' * panel_bg_padding;
-               mySize -= '2 2 0' * panel_bg_padding;
-       }
-
-       float currentTime = gettime(GETTIME_REALTIME);
-       if(cvar("hud_panel_engineinfo_framecounter_exponentialmovingaverage"))
-       {
-               float currentframetime = currentTime - prevfps_time;
-               frametimeavg = (frametimeavg + frametimeavg1 + frametimeavg2 + currentframetime)/4; // average three frametimes into framecounter for slightly more stable fps readings :P
-               frametimeavg2 = frametimeavg1;
-               frametimeavg1 = frametimeavg;
-
-               float weight;
-               weight = cvar("hud_panel_engineinfo_framecounter_exponentialmovingaverage_new_weight");
-               if(currentframetime > 0.0001) // filter out insane values which sometimes seem to occur and throw off the average? If you are getting 10,000 fps or more, then you don't need a framerate counter.
-               {
-                       if(fabs(prevfps - (1/frametimeavg)) > prevfps * cvar("hud_panel_engineinfo_framecounter_exponentialmovingaverage_instantupdate_change_threshold")) // if there was a big jump in fps, just force prevfps at current (1/currentframetime) to make big updates instant
-                               prevfps = (1/currentframetime);
-                       prevfps = (1 - weight) * prevfps + weight * (1/frametimeavg); // framecounter just used so there's no need for a new variable, think of it as "frametime average"
-               }
-               prevfps_time = currentTime;
-       }
-       else
-       {
-               framecounter += 1;
-               if(currentTime - prevfps_time > autocvar_hud_panel_engineinfo_framecounter_time)
-               {
-                       prevfps = framecounter/(currentTime - prevfps_time);
-                       framecounter = 0;
-                       prevfps_time = currentTime;
-               }
-       }
-
-       vector color;
-       color = HUD_Get_Num_Color (prevfps, 100);
-       drawstring_aspect(pos, sprintf(_("FPS: %.*f"), autocvar_hud_panel_engineinfo_framecounter_decimals, prevfps), mySize, color, panel_fg_alpha, DRAWFLAG_NORMAL);
-}
-
-// Info messages panel (#14)
-//
-#define drawInfoMessage(s) do {                                                                                                                                                                                \
-       if(autocvar_hud_panel_infomessages_flip)                                                                                                                                                \
-               o.x = pos.x + mySize.x - stringwidth(s, true, fontsize);                                                                                                        \
-       drawcolorcodedstring(o, s, fontsize, a, DRAWFLAG_NORMAL);                                                                                                               \
-       o.y += fontsize.y;                                                                                                                                                                                              \
-} while(0)
-void HUD_InfoMessages()
-{
-       if(!autocvar__hud_configure)
-       {
-               if(!autocvar_hud_panel_infomessages) return;
-       }
-
-       HUD_Panel_UpdateCvars();
-       vector pos, mySize;
-       pos = panel_pos;
-       mySize = panel_size;
-
-       HUD_Panel_DrawBg(1);
-       if(panel_bg_padding)
-       {
-               pos += '1 1 0' * panel_bg_padding;
-               mySize -= '2 2 0' * panel_bg_padding;
-       }
-
-       // always force 5:1 aspect
-       vector newSize = '0 0 0';
-       if(mySize.x/mySize.y > 5)
-       {
-               newSize.x = 5 * mySize.y;
-               newSize.y = mySize.y;
-
-               pos.x = pos.x + (mySize.x - newSize.x) / 2;
-       }
-       else
-       {
-               newSize.y = 1/5 * mySize.x;
-               newSize.x = mySize.x;
-
-               pos.y = pos.y + (mySize.y - newSize.y) / 2;
-       }
-
-       mySize = newSize;
-       entity tm;
-       vector o;
-       o = pos;
-
-       vector fontsize;
-       fontsize = '0.20 0.20 0' * mySize.y;
-
-       float a;
-       a = panel_fg_alpha;
-
-       string s;
-       if(!autocvar__hud_configure)
-       {
-               if(spectatee_status && !intermission)
-               {
-                       a = 1;
-                       if(spectatee_status == -1)
-                               s = _("^1Observing");
-                       else
-                               s = sprintf(_("^1Spectating: ^7%s"), GetPlayerName(current_player));
-                       drawInfoMessage(s);
-
-                       if(spectatee_status == -1)
-                               s = sprintf(_("^1Press ^3%s^1 to spectate"), getcommandkey("primary fire", "+fire"));
-                       else
-                               s = sprintf(_("^1Press ^3%s^1 or ^3%s^1 for next or previous player"), getcommandkey("next weapon", "weapnext"), getcommandkey("previous weapon", "weapprev"));
-                       drawInfoMessage(s);
-
-                       if(spectatee_status == -1)
-                               s = sprintf(_("^1Use ^3%s^1 or ^3%s^1 to change the speed"), getcommandkey("next weapon", "weapnext"), getcommandkey("previous weapon", "weapprev"));
-                       else
-                               s = sprintf(_("^1Press ^3%s^1 to observe"), getcommandkey("secondary fire", "+fire2"));
-                       drawInfoMessage(s);
-
-                       s = sprintf(_("^1Press ^3%s^1 for gamemode info"), getcommandkey("server info", "+show_info"));
-                       drawInfoMessage(s);
-
-                       if(gametype == MAPINFO_TYPE_LMS)
-                       {
-                               entity sk;
-                               sk = playerslots[player_localnum];
-                               if(sk.(scores[ps_primary]) >= 666)
-                                       s = _("^1Match has already begun");
-                               else if(sk.(scores[ps_primary]) > 0)
-                                       s = _("^1You have no more lives left");
-                               else
-                                       s = sprintf(_("^1Press ^3%s^1 to join"), getcommandkey("jump", "+jump"));
-                       }
-                       else
-                               s = sprintf(_("^1Press ^3%s^1 to join"), getcommandkey("jump", "+jump"));
-                       drawInfoMessage(s);
-
-                       //show restart countdown:
-                       if (time < getstatf(STAT_GAMESTARTTIME)) {
-                               float countdown;
-                               //we need to ceil, otherwise the countdown would be off by .5 when using round()
-                               countdown = ceil(getstatf(STAT_GAMESTARTTIME) - time);
-                               s = sprintf(_("^1Game starts in ^3%d^1 seconds"), countdown);
-                               drawcolorcodedstring(o, s, fontsize, a, DRAWFLAG_NORMAL);
-                               o.y += fontsize.y;
-                       }
-               }
-               if(warmup_stage && !intermission)
-               {
-                       s = _("^2Currently in ^1warmup^2 stage!");
-                       drawInfoMessage(s);
-               }
-
-               string blinkcolor;
-               if(time % 1 >= 0.5)
-                       blinkcolor = "^1";
-               else
-                       blinkcolor = "^3";
-
-               if(ready_waiting && !intermission && !spectatee_status)
-               {
-                       if(ready_waiting_for_me)
-                       {
-                               if(warmup_stage)
-                                       s = sprintf(_("%sPress ^3%s%s to end warmup"), blinkcolor, getcommandkey("ready", "ready"), blinkcolor);
-                               else
-                                       s = sprintf(_("%sPress ^3%s%s once you are ready"), blinkcolor, getcommandkey("ready", "ready"), blinkcolor);
-                       }
-                       else
-                       {
-                               if(warmup_stage)
-                                       s = _("^2Waiting for others to ready up to end warmup...");
-                               else
-                                       s = _("^2Waiting for others to ready up...");
-                       }
-                       drawInfoMessage(s);
-               }
-               else if(warmup_stage && !intermission && !spectatee_status)
-               {
-                       s = sprintf(_("^2Press ^3%s^2 to end warmup"), getcommandkey("ready", "ready"));
-                       drawInfoMessage(s);
-               }
-
-               if(teamplay && !intermission && !spectatee_status && gametype != MAPINFO_TYPE_CA && teamnagger)
-               {
-                       float ts_min = 0, ts_max = 0;
-                       tm = teams.sort_next;
-                       if (tm)
-                       {
-                               for (; tm.sort_next; tm = tm.sort_next)
-                               {
-                                       if(!tm.team_size || tm.team == NUM_SPECTATOR)
-                                               continue;
-                                       if(!ts_min) ts_min = tm.team_size;
-                                       else ts_min = min(ts_min, tm.team_size);
-                                       if(!ts_max) ts_max = tm.team_size;
-                                       else ts_max = max(ts_max, tm.team_size);
-                               }
-                               if ((ts_max - ts_min) > 1)
-                               {
-                                       s = strcat(blinkcolor, _("Teamnumbers are unbalanced!"));
-                                       tm = GetTeam(myteam, false);
-                                       if (tm)
-                                       if (tm.team != NUM_SPECTATOR)
-                                       if (tm.team_size == ts_max)
-                                               s = strcat(s, sprintf(_(" Press ^3%s%s to adjust"), getcommandkey("team menu", "menu_showteamselect"), blinkcolor));
-                                       drawInfoMessage(s);
-                               }
-                       }
-               }
-       }
-       else
-       {
-               s = _("^7Press ^3ESC ^7to show HUD options.");
-               drawInfoMessage(s);
-               s = _("^3Doubleclick ^7a panel for panel-specific options.");
-               drawInfoMessage(s);
-               s = _("^3CTRL ^7to disable collision testing, ^3SHIFT ^7and");
-               drawInfoMessage(s);
-               s = _("^3ALT ^7+ ^3ARROW KEYS ^7for fine adjustments.");
-               drawInfoMessage(s);
-       }
-}
-
-// Physics panel (#15)
-//
-vector acc_prevspeed;
-float acc_prevtime, acc_avg, top_speed, top_speed_time;
-float physics_update_time, discrete_speed, discrete_acceleration;
-void HUD_Physics()
-{
-       if(!autocvar__hud_configure)
-       {
-               if(!autocvar_hud_panel_physics) return;
-               if(spectatee_status == -1 && (autocvar_hud_panel_physics == 1 || autocvar_hud_panel_physics == 3)) return;
-               if(autocvar_hud_panel_physics == 3 && !(gametype == MAPINFO_TYPE_RACE || gametype == MAPINFO_TYPE_CTS)) return;
-       }
-
-       HUD_Panel_UpdateCvars();
-
-       draw_beginBoldFont();
-
-       HUD_Panel_DrawBg(1);
-       if(panel_bg_padding)
-       {
-               panel_pos += '1 1 0' * panel_bg_padding;
-               panel_size -= '2 2 0' * panel_bg_padding;
-       }
-
-       float acceleration_progressbar_scale = 0;
-       if(autocvar_hud_panel_physics_progressbar && autocvar_hud_panel_physics_acceleration_progressbar_scale > 1)
-               acceleration_progressbar_scale = autocvar_hud_panel_physics_acceleration_progressbar_scale;
-
-       float text_scale;
-       if (autocvar_hud_panel_physics_text_scale <= 0)
-               text_scale = 1;
-       else
-               text_scale = min(autocvar_hud_panel_physics_text_scale, 1);
-
-       //compute speed
-       float speed, conversion_factor;
-       string unit;
-
-       switch(autocvar_hud_panel_physics_speed_unit)
-       {
-               default:
-               case 1:
-                       unit = _(" qu/s");
-                       conversion_factor = 1.0;
-                       break;
-               case 2:
-                       unit = _(" m/s");
-                       conversion_factor = 0.0254;
-                       break;
-               case 3:
-                       unit = _(" km/h");
-                       conversion_factor = 0.0254 * 3.6;
-                       break;
-               case 4:
-                       unit = _(" mph");
-                       conversion_factor = 0.0254 * 3.6 * 0.6213711922;
-                       break;
-               case 5:
-                       unit = _(" knots");
-                       conversion_factor = 0.0254 * 1.943844492; // 1 m/s = 1.943844492 knots, because 1 knot = 1.852 km/h
-                       break;
-       }
-
-       vector vel = (csqcplayer ? csqcplayer.velocity : pmove_vel);
-
-       float max_speed = floor( autocvar_hud_panel_physics_speed_max * conversion_factor + 0.5 );
-       if (autocvar__hud_configure)
-               speed = floor( max_speed * 0.65 + 0.5 );
-       else if(autocvar_hud_panel_physics_speed_vertical)
-               speed = floor( vlen(vel) * conversion_factor + 0.5 );
-       else
-               speed = floor( vlen(vel - vel.z * '0 0 1') * conversion_factor + 0.5 );
-
-       //compute acceleration
-       float acceleration, f;
-       if (autocvar__hud_configure)
-               acceleration = autocvar_hud_panel_physics_acceleration_max * 0.3;
-       else
-       {
-               // 1 m/s = 0.0254 qu/s; 1 g = 9.80665 m/s^2
-               f = time - acc_prevtime;
-               if(autocvar_hud_panel_physics_acceleration_vertical)
-                       acceleration = (vlen(vel) - vlen(acc_prevspeed));
-               else
-                       acceleration = (vlen(vel - '0 0 1' * vel.z) - vlen(acc_prevspeed - '0 0 1' * acc_prevspeed.z));
-
-               acceleration = acceleration * (1 / max(0.0001, f)) * (0.0254 / 9.80665);
-
-               acc_prevspeed = vel;
-               acc_prevtime = time;
-
-               if(autocvar_hud_panel_physics_acceleration_movingaverage)
-               {
-                       f = bound(0, f * 10, 1);
-                       acc_avg = acc_avg * (1 - f) + acceleration * f;
-                       acceleration = acc_avg;
-               }
-       }
-
-       int acc_decimals = 2;
-       if(time > physics_update_time)
-       {
-               // workaround for ftos_decimals returning a negative 0
-               if(discrete_acceleration > -1 / pow(10, acc_decimals) && discrete_acceleration < 0)
-                       discrete_acceleration = 0;
-               discrete_acceleration = acceleration;
-               discrete_speed = speed;
-               physics_update_time += autocvar_hud_panel_physics_update_interval;
-       }
-
-       //compute layout
-       float panel_ar = panel_size.x/panel_size.y;
-       vector speed_offset = '0 0 0', acceleration_offset = '0 0 0';
-       if (panel_ar >= 5 && !acceleration_progressbar_scale)
-       {
-               panel_size.x *= 0.5;
-               if (autocvar_hud_panel_physics_flip)
-                       speed_offset.x = panel_size.x;
-               else
-                       acceleration_offset.x = panel_size.x;
-       }
-       else
-       {
-               panel_size.y *= 0.5;
-               if (autocvar_hud_panel_physics_flip)
-                       speed_offset.y = panel_size.y;
-               else
-                       acceleration_offset.y = panel_size.y;
-       }
-       int speed_baralign, acceleration_baralign;
-       if (autocvar_hud_panel_physics_baralign == 1)
-               acceleration_baralign = speed_baralign = 1;
-    else if(autocvar_hud_panel_physics_baralign == 4)
-               acceleration_baralign = speed_baralign = 2;
-       else if (autocvar_hud_panel_physics_flip)
-       {
-               acceleration_baralign = (autocvar_hud_panel_physics_baralign == 2);
-               speed_baralign = (autocvar_hud_panel_physics_baralign == 3);
-       }
-       else
-       {
-               speed_baralign = (autocvar_hud_panel_physics_baralign == 2);
-               acceleration_baralign = (autocvar_hud_panel_physics_baralign == 3);
-       }
-       if (autocvar_hud_panel_physics_acceleration_progressbar_mode == 0)
-               acceleration_baralign = 3; //override hud_panel_physics_baralign value for acceleration
-
-       //draw speed
-       if(speed)
-       if(autocvar_hud_panel_physics_progressbar == 1 || autocvar_hud_panel_physics_progressbar == 2)
-               HUD_Panel_DrawProgressBar(panel_pos + speed_offset, panel_size, "progressbar", speed/max_speed, 0, speed_baralign, autocvar_hud_progressbar_speed_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
-       vector tmp_offset = '0 0 0', tmp_size = '0 0 0';
-       if (autocvar_hud_panel_physics_text == 1 || autocvar_hud_panel_physics_text == 2)
-       {
-               tmp_size.x = panel_size.x * 0.75;
-               tmp_size.y = panel_size.y * text_scale;
-               if (speed_baralign)
-                       tmp_offset.x = panel_size.x - tmp_size.x;
-               //else
-                       //tmp_offset_x = 0;
-               tmp_offset.y = (panel_size.y - tmp_size.y) / 2;
-               drawstring_aspect(panel_pos + speed_offset + tmp_offset, ftos(discrete_speed), tmp_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-
-               //draw speed unit
-               if (speed_baralign)
-                       tmp_offset.x = 0;
-               else
-                       tmp_offset.x = tmp_size.x;
-               if (autocvar_hud_panel_physics_speed_unit_show)
-               {
-                       //tmp_offset_y = 0;
-                       tmp_size.x = panel_size.x * (1 - 0.75);
-                       tmp_size.y = panel_size.y * 0.4 * text_scale;
-                       tmp_offset.y = (panel_size.y * 0.4 - tmp_size.y) / 2;
-                       drawstring_aspect(panel_pos + speed_offset + tmp_offset, unit, tmp_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-               }
-       }
-
-       //compute and draw top speed
-       if (autocvar_hud_panel_physics_topspeed)
-       if (autocvar_hud_panel_physics_text == 1 || autocvar_hud_panel_physics_text == 2)
-       {
-               if (autocvar__hud_configure)
-               {
-                       top_speed = floor( max_speed * 0.75 + 0.5 );
-                       f = 1;
-               }
-               else
-               {
-                       if (speed >= top_speed)
-                       {
-                               top_speed = speed;
-                               top_speed_time = time;
-                       }
-                       if (top_speed != 0)
-                       {
-                               f = max(1, autocvar_hud_panel_physics_topspeed_time);
-                               // divide by f to make it start from 1
-                               f = cos( ((time - top_speed_time) / f) * PI/2 );
-                       }
-            else //hide top speed 0, it would be stupid
-                               f = 0;
-               }
-               if (f > 0)
-               {
-                       //top speed progressbar peak
-                       if(speed < top_speed)
-                       if(autocvar_hud_panel_physics_progressbar == 1 || autocvar_hud_panel_physics_progressbar == 2)
-                       {
-                               float peak_offsetX;
-                               vector peak_size = '0 0 0';
-                               if (speed_baralign == 0)
-                                       peak_offsetX = min(top_speed, max_speed)/max_speed * panel_size.x;
-                else if (speed_baralign == 1)
-                                       peak_offsetX = (1 - min(top_speed, max_speed)/max_speed) * panel_size.x;
-                else // if (speed_baralign == 2)
-                    peak_offsetX = min(top_speed, max_speed)/max_speed * panel_size.x * 0.5;
-                               peak_size.x = floor(panel_size.x * 0.01 + 1.5);
-                peak_size.y = panel_size.y;
-                if (speed_baralign == 2) // draw two peaks, on both sides
-                {
-                    drawfill(panel_pos + speed_offset + eX * (0.5 * panel_size.x + peak_offsetX - peak_size.x), peak_size, autocvar_hud_progressbar_speed_color, f * autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
-                    drawfill(panel_pos + speed_offset + eX * (0.5 * panel_size.x - peak_offsetX + peak_size.x), peak_size, autocvar_hud_progressbar_speed_color, f * autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
-                }
-                else
-                    drawfill(panel_pos + speed_offset + eX * (peak_offsetX - peak_size.x), peak_size, autocvar_hud_progressbar_speed_color, f * autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
-                       }
-
-                       //top speed
-                       tmp_offset.y = panel_size.y * 0.4;
-                       tmp_size.x = panel_size.x * (1 - 0.75);
-                       tmp_size.y = (panel_size.y - tmp_offset.y) * text_scale;
-                       tmp_offset.y += (panel_size.y - tmp_offset.y - tmp_size.y) / 2;
-                       drawstring_aspect(panel_pos + speed_offset + tmp_offset, ftos(top_speed), tmp_size, '1 0 0', f * panel_fg_alpha, DRAWFLAG_NORMAL);
-               }
-               else
-                       top_speed = 0;
-       }
-
-       //draw acceleration
-       if(acceleration)
-       if(autocvar_hud_panel_physics_progressbar == 1 || autocvar_hud_panel_physics_progressbar == 3)
-       {
-               vector progressbar_color;
-               if(acceleration < 0)
-                       progressbar_color = autocvar_hud_progressbar_acceleration_neg_color;
-               else
-                       progressbar_color = autocvar_hud_progressbar_acceleration_color;
-
-               f = acceleration/autocvar_hud_panel_physics_acceleration_max;
-               if (autocvar_hud_panel_physics_acceleration_progressbar_nonlinear)
-                       f = (f >= 0 ? sqrt(f) : -sqrt(-f));
-
-               if (acceleration_progressbar_scale) // allow progressbar to go out of panel bounds
-               {
-                       tmp_size = acceleration_progressbar_scale * panel_size.x * eX + panel_size.y * eY;
-
-                       if (acceleration_baralign == 1)
-                               tmp_offset.x = panel_size.x - tmp_size.x;
-                       else if (acceleration_baralign == 2 || acceleration_baralign == 3)
-                               tmp_offset.x = (panel_size.x - tmp_size.x) / 2;
-                       else
-                               tmp_offset.x = 0;
-                       tmp_offset.y = 0;
-               }
-               else
-               {
-                       tmp_size = panel_size;
-                       tmp_offset = '0 0 0';
-               }
-
-               HUD_Panel_DrawProgressBar(panel_pos + acceleration_offset + tmp_offset, tmp_size, "accelbar", f, 0, acceleration_baralign, progressbar_color, autocvar_hud_progressbar_alpha * panel_fg_alpha, DRAWFLAG_NORMAL);
-       }
-
-       if(autocvar_hud_panel_physics_text == 1 || autocvar_hud_panel_physics_text == 3)
-       {
-               tmp_size.x = panel_size.x;
-               tmp_size.y = panel_size.y * text_scale;
-               tmp_offset.x = 0;
-               tmp_offset.y = (panel_size.y - tmp_size.y) / 2;
-
-               drawstring_aspect(panel_pos + acceleration_offset + tmp_offset, strcat(ftos_decimals(discrete_acceleration, acc_decimals), "g"), tmp_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
-       }
-
-       draw_endBoldFont();
-}
-
-// CenterPrint (#16)
-//
-const int CENTERPRINT_MAX_MSGS = 10;
-const int CENTERPRINT_MAX_ENTRIES = 50;
-const float CENTERPRINT_SPACING = 0.7;
-int cpm_index;
-string centerprint_messages[CENTERPRINT_MAX_MSGS];
-int centerprint_msgID[CENTERPRINT_MAX_MSGS];
-float centerprint_time[CENTERPRINT_MAX_MSGS];
-float centerprint_expire_time[CENTERPRINT_MAX_MSGS];
-int centerprint_countdown_num[CENTERPRINT_MAX_MSGS];
-bool centerprint_showing;
-
-void centerprint_generic(int new_id, string strMessage, float duration, int countdown_num)
-{
-       //printf("centerprint_generic(%d, '%s^7', %d, %d);\n", new_id, strMessage, duration, countdown_num);
-       int i, j;
-
-       if(strMessage == "" && new_id == 0)
-               return;
-
-       // strip trailing newlines
-       j = strlen(strMessage) - 1;
-       while(substring(strMessage, j, 1) == "\n" && j >= 0)
-               --j;
-       if (j < strlen(strMessage) - 1)
-               strMessage = substring(strMessage, 0, j + 1);
-
-       if(strMessage == "" && new_id == 0)
-               return;
-
-       // strip leading newlines
-       j = 0;
-       while(substring(strMessage, j, 1) == "\n" && j < strlen(strMessage))
-               ++j;
-       if (j > 0)
-               strMessage = substring(strMessage, j, strlen(strMessage) - j);
-
-       if(strMessage == "" && new_id == 0)
-               return;
-
-       if (!centerprint_showing)
-               centerprint_showing = true;
-
-       for (i=0, j=cpm_index; i<CENTERPRINT_MAX_MSGS; ++i, ++j)
-       {
-               if (j == CENTERPRINT_MAX_MSGS)
-                       j = 0;
-               if (new_id && new_id == centerprint_msgID[j])
-               {
-                       if (strMessage == "" && centerprint_messages[j] != "" && centerprint_countdown_num[j] == 0)
-                       {
-                               // fade out the current msg (duration and countdown_num are ignored)
-                               centerprint_time[j] = min(5, autocvar_hud_panel_centerprint_fade_out);
-                               if (centerprint_expire_time[j] > time + min(5, autocvar_hud_panel_centerprint_fade_out) || centerprint_expire_time[j] < time)
-                                       centerprint_expire_time[j] = time + min(5, autocvar_hud_panel_centerprint_fade_out);
-                               return;
-                       }
-                       break; // found a msg with the same id, at position j
-               }
-       }
-
-       if (i == CENTERPRINT_MAX_MSGS)
-       {
-               // a msg with the same id was not found, add the msg at the next position
-               --cpm_index;
-               if (cpm_index == -1)
-                       cpm_index = CENTERPRINT_MAX_MSGS - 1;
-               j = cpm_index;
-       }
-       if(centerprint_messages[j])
-               strunzone(centerprint_messages[j]);
-       centerprint_messages[j] = strzone(strMessage);
-       centerprint_msgID[j] = new_id;
-       if (duration < 0)
-       {
-               centerprint_time[j] = -1;
-               centerprint_expire_time[j] = time;
-       }
-       else
-       {
-               if(duration == 0)
-                       duration = max(1, autocvar_hud_panel_centerprint_time);
-               centerprint_time[j] = duration;
-               centerprint_expire_time[j] = time + duration;
-       }
-       centerprint_countdown_num[j] = countdown_num;
-}
-
-void centerprint_hud(string strMessage)
-{
-       centerprint_generic(0, strMessage, autocvar_hud_panel_centerprint_time, 0);
-}
-
-void reset_centerprint_messages()
-{
-       int i;
-       for (i=0; i<CENTERPRINT_MAX_MSGS; ++i)
-       {
-               centerprint_expire_time[i] = 0;
-               centerprint_time[i] = 1;
-               centerprint_msgID[i] = 0;
-               if(centerprint_messages[i])
-                       strunzone(centerprint_messages[i]);
-               centerprint_messages[i] = string_null;
-       }
-}
-float hud_configure_cp_generation_time;
-void HUD_CenterPrint ()
-{
-       if(!autocvar__hud_configure)
-       {
-               if(!autocvar_hud_panel_centerprint) return;
-
-               if(hud_configure_prev)
-                       reset_centerprint_messages();
-       }
-       else
-       {
-               if(!hud_configure_prev)
-                       reset_centerprint_messages();
-               if (time > hud_configure_cp_generation_time)
-               {
-                       if(highlightedPanel == HUD_PANEL(CENTERPRINT))
-                       {
-                               float r;
-                               r = random();
-                               if (r > 0.8)
-                                       centerprint_generic(floor(r*1000), strcat(sprintf("^3Countdown message at time %s", seconds_tostring(time)), ", seconds left: ^COUNT"), 1, 10);
-                               else if (r > 0.55)
-                                       centerprint_generic(0, sprintf("^1Multiline message at time %s that\n^1lasts longer than normal", seconds_tostring(time)), 20, 0);
-                               else
-                                       centerprint_hud(sprintf("Message at time %s", seconds_tostring(time)));
-                               hud_configure_cp_generation_time = time + 1 + random()*4;
-                       }
-                       else
-                       {
-                               centerprint_generic(0, sprintf("Centerprint message", seconds_tostring(time)), 10, 0);
-                               hud_configure_cp_generation_time = time + 10 - random()*3;
-                       }
-               }
-       }
-
-       // this panel fades only when the menu does
-       float hud_fade_alpha_save = 0;
-       if(scoreboard_fade_alpha)
-       {
-               hud_fade_alpha_save = hud_fade_alpha;
-               hud_fade_alpha = 1 - autocvar__menu_alpha;
-       }
-       HUD_Panel_UpdateCvars();
-
-       if ( HUD_Radar_Clickable() )
-       {
-               if (hud_panel_radar_bottom >= 0.96 * vid_conheight)
-                       return;
-
-               panel_pos = eY * hud_panel_radar_bottom + eX * 0.5 * (vid_conwidth - panel_size_x);
-               panel_size_y = min(panel_size_y, vid_conheight - hud_panel_radar_bottom);
-       }
-       else if(scoreboard_fade_alpha)
-       {
-               hud_fade_alpha = hud_fade_alpha_save;
-
-               // move the panel below the scoreboard
-               if (scoreboard_bottom >= 0.96 * vid_conheight)
-                       return;
-               vector target_pos;
-
-               target_pos = eY * scoreboard_bottom + eX * 0.5 * (vid_conwidth - panel_size.x);
-
-               if(target_pos.y > panel_pos.y)
-               {
-                       panel_pos = panel_pos + (target_pos - panel_pos) * sqrt(scoreboard_fade_alpha);
-                       panel_size.y = min(panel_size.y, vid_conheight - scoreboard_bottom);
-               }
-       }
-
-       HUD_Panel_DrawBg(1);
-
-       if (!centerprint_showing)
-               return;
-
-       if(panel_bg_padding)
-       {
-               panel_pos += '1 1 0' * panel_bg_padding;
-               panel_size -= '2 2 0' * panel_bg_padding;
-       }
-
-       int entries;
-       float height;
-       vector fontsize;
-       // entries = bound(1, floor(CENTERPRINT_MAX_ENTRIES * 4 * panel_size_y/panel_size_x), CENTERPRINT_MAX_ENTRIES);
-       // height = panel_size_y/entries;
-       // fontsize = '1 1 0' * height;
-       height = vid_conheight/50 * autocvar_hud_panel_centerprint_fontscale;
-       fontsize = '1 1 0' * height;
-       entries = bound(1, floor(panel_size.y/height), CENTERPRINT_MAX_ENTRIES);
-
-       int i, j, k, n, g;
-       float a, sz, align, current_msg_posY = 0, msg_size;
-       vector pos;
-       string ts;
-       bool all_messages_expired = true;
-
-       pos = panel_pos;
-       if (autocvar_hud_panel_centerprint_flip)
-               pos.y += panel_size.y;
-       align = bound(0, autocvar_hud_panel_centerprint_align, 1);
-       for (g=0, i=0, j=cpm_index; i<CENTERPRINT_MAX_MSGS; ++i, ++j)
-       {
-               if (j == CENTERPRINT_MAX_MSGS)
-                       j = 0;
-               if (centerprint_expire_time[j] <= time)
-               {
-                       if (centerprint_countdown_num[j] && centerprint_time[j] > 0)
-                       {
-                               centerprint_countdown_num[j] = centerprint_countdown_num[j] - 1;
-                               if (centerprint_countdown_num[j] == 0)
-                                       continue;
-                               centerprint_expire_time[j] = centerprint_expire_time[j] + centerprint_time[j];
-                       }
-                       else if(centerprint_time[j] != -1)
-                               continue;
-               }
-
-               all_messages_expired = false;
-
-               // fade the centerprint_hud in/out
-               if(centerprint_time[j] < 0)  // Expired but forced. Expire time is the fade-in time.
-                       a = (time - centerprint_expire_time[j]) / max(0.0001, autocvar_hud_panel_centerprint_fade_in);
-               else if(centerprint_expire_time[j] - autocvar_hud_panel_centerprint_fade_out > time)  // Regularily printed. Not fading out yet.
-                       a = (time - (centerprint_expire_time[j] - centerprint_time[j])) / max(0.0001, autocvar_hud_panel_centerprint_fade_in);
-               else // Expiring soon, so fade it out.
-                       a = (centerprint_expire_time[j] - time) / max(0.0001, autocvar_hud_panel_centerprint_fade_out);
-
-               // while counting down show it anyway in order to hold the current message position
-               if (a <= 0.5/255.0 && centerprint_countdown_num[j] == 0)  // Guaranteed invisible - don't show.
-                       continue;
-               if (a > 1)
-                       a = 1;
-
-               // set the size from fading in/out before subsequent fading
-               sz = autocvar_hud_panel_centerprint_fade_minfontsize + a * (1 - autocvar_hud_panel_centerprint_fade_minfontsize);
-
-               // also fade it based on positioning
-               if(autocvar_hud_panel_centerprint_fade_subsequent)
-               {
-                       a = a * bound(autocvar_hud_panel_centerprint_fade_subsequent_passone_minalpha, (1 - (g / max(1, autocvar_hud_panel_centerprint_fade_subsequent_passone))), 1); // pass one: all messages after the first have half theAlpha
-                       a = a * bound(autocvar_hud_panel_centerprint_fade_subsequent_passtwo_minalpha, (1 - (g / max(1, autocvar_hud_panel_centerprint_fade_subsequent_passtwo))), 1); // pass two: after that, gradually lower theAlpha even more for each message
-               }
-               a *= panel_fg_alpha;
-
-               // finally set the size based on the new theAlpha from subsequent fading
-               sz = sz * (autocvar_hud_panel_centerprint_fade_subsequent_minfontsize + a * (1 - autocvar_hud_panel_centerprint_fade_subsequent_minfontsize));
-               drawfontscale = sz * '1 1 0';
-
-               if (centerprint_countdown_num[j])
-                       n = tokenizebyseparator(strreplace("^COUNT", count_seconds(centerprint_countdown_num[j]), centerprint_messages[j]), "\n");
-               else
-                       n = tokenizebyseparator(centerprint_messages[j], "\n");
-
-               if (autocvar_hud_panel_centerprint_flip)
-               {
-                       // check if the message can be entirely shown
-                       for(k = 0; k < n; ++k)
-                       {
-                               getWrappedLine_remaining = argv(k);
-                               while(getWrappedLine_remaining)
-                               {
-                                       ts = getWrappedLine(panel_size.x * sz, fontsize, stringwidth_colors);
-                                       if (ts != "")
-                                               pos.y -= fontsize.y;
-                                       else
-                                               pos.y -= fontsize.y * CENTERPRINT_SPACING/2;
-                               }
-                       }
-                       current_msg_posY = pos.y; // save starting pos (first line) of the current message
-               }
-
-               msg_size = pos.y;
-               for(k = 0; k < n; ++k)
-               {
-                       getWrappedLine_remaining = argv(k);
-                       while(getWrappedLine_remaining)
-                       {
-                               ts = getWrappedLine(panel_size.x * sz, fontsize, stringwidth_colors);
-                               if (ts != "")
-                               {
-                                       if (align)
-                                               pos.x = panel_pos.x + (panel_size.x - stringwidth(ts, true, fontsize)) * align;
-                                       if (a > 0.5/255.0)  // Otherwise guaranteed invisible - don't show. This is checked a second time after some multiplications with other factors were done so temporary changes of these cannot cause flicker.
-                                               drawcolorcodedstring(pos + eY * 0.5 * (1 - sz) * fontsize.y, ts, fontsize, a, DRAWFLAG_NORMAL);
-                                       pos.y += fontsize.y;
-                               }
-                               else
-                                       pos.y += fontsize.y * CENTERPRINT_SPACING/2;
-                       }
-               }
-
-               ++g; // move next position number up
-
-               msg_size = pos.y - msg_size;
-               if (autocvar_hud_panel_centerprint_flip)
-               {
-                       pos.y = current_msg_posY - CENTERPRINT_SPACING * fontsize.y;
-                       if (a < 1 && centerprint_msgID[j] == 0) // messages with id can be replaced just after they are faded out, so never move over them the next messages
-                               pos.y += (msg_size + CENTERPRINT_SPACING * fontsize.y) * (1 - sqrt(sz));
-
-                       if (pos.y < panel_pos.y) // check if the next message can be shown
-                       {
-                               drawfontscale = '1 1 0';
-                               return;
-                       }
-               }
-               else
-               {
-                       pos.y += CENTERPRINT_SPACING * fontsize.y;
-                       if (a < 1 && centerprint_msgID[j] == 0) // messages with id can be replaced just after they are faded out, so never move over them the next messages
-                               pos.y -= (msg_size + CENTERPRINT_SPACING * fontsize.y) * (1 - sqrt(sz));
-
-                       if(pos.y > panel_pos.y + panel_size.y - fontsize.y) // check if the next message can be shown
-                       {
-                               drawfontscale = '1 1 0';
-                               return;
-                       }
-               }
-       }
-       drawfontscale = '1 1 0';
-       if (all_messages_expired)
-       {
-               centerprint_showing = false;
-               reset_centerprint_messages();
-       }
-}
-
-
-// Minigame
-//
-#include "../common/minigames/cl_minigames_hud.qc"
-
-
-// QuickMenu (#23)
-//
-#include "quickmenu.qc"
-
-
-/*
-==================
-Main HUD system
-==================
-*/
-
-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(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()
-{
-       // reset gametype specific icons
-       if(gametype == MAPINFO_TYPE_CTF)
-               HUD_Mod_CTF_Reset();
-}
-
-void HUD_Main()
-{
-       int i;
-       // global hud theAlpha fade
-       if(menu_enabled == 1)
-               hud_fade_alpha = 1;
-       else
-               hud_fade_alpha = (1 - autocvar__menu_alpha);
-
-       if(scoreboard_fade_alpha)
-               hud_fade_alpha = (1 - scoreboard_fade_alpha);
-
-       HUD_Configure_Frame();
-
-       // panels that we want to be active together with the scoreboard
-       // they must fade only when the menu does
-       if(scoreboard_fade_alpha == 1)
-       {
-               HUD_Panel_Draw(HUD_PANEL(CENTERPRINT));
-               return;
-       }
-
-       if(!autocvar__hud_configure && !hud_fade_alpha)
-       {
-               hud_fade_alpha = 1;
-               HUD_Panel_Draw(HUD_PANEL(VOTE));
-               hud_fade_alpha = 0;
-               return;
-       }
-
-       // Drawing stuff
-       if (hud_skin_prev != autocvar_hud_skin)
-       {
-               if (hud_skin_path)
-                       strunzone(hud_skin_path);
-               hud_skin_path = strzone(strcat("gfx/hud/", autocvar_hud_skin));
-               if (hud_skin_prev)
-                       strunzone(hud_skin_prev);
-               hud_skin_prev = strzone(autocvar_hud_skin);
-       }
-
-       // draw the dock
-       if(autocvar_hud_dock != "" && autocvar_hud_dock != "0")
-       {
-               int f;
-               vector color;
-               float hud_dock_color_team = autocvar_hud_dock_color_team;
-               if((teamplay) && hud_dock_color_team) {
-                       if(autocvar__hud_configure && myteam == NUM_SPECTATOR)
-                               color = '1 0 0' * hud_dock_color_team;
-                       else
-                               color = myteamcolors * hud_dock_color_team;
-               }
-               else if(autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && hud_dock_color_team) {
-                       color = '1 0 0' * hud_dock_color_team;
-               }
-               else
-               {
-                       string hud_dock_color = autocvar_hud_dock_color;
-                       if(hud_dock_color == "shirt") {
-                               f = stof(getplayerkeyvalue(current_player, "colors"));
-                               color = colormapPaletteColor(floor(f / 16), 0);
-                       }
-                       else if(hud_dock_color == "pants") {
-                               f = stof(getplayerkeyvalue(current_player, "colors"));
-                               color = colormapPaletteColor(f % 16, 1);
-                       }
-                       else
-                               color = stov(hud_dock_color);
-               }
-
-               string pic;
-               pic = strcat(hud_skin_path, "/", autocvar_hud_dock);
-               if(precache_pic(pic) == "") {
-                       pic = strcat(hud_skin_path, "/dock_medium");
-                       if(precache_pic(pic) == "") {
-                               pic = "gfx/hud/default/dock_medium";
-                       }
-               }
-               drawpic('0 0 0', pic, eX * vid_conwidth + eY * vid_conheight, color, autocvar_hud_dock_alpha * hud_fade_alpha, DRAWFLAG_NORMAL); // no aspect ratio forcing on dock...
-       }
-
-       // cache the panel order into the panel_order array
-       if(autocvar__hud_panelorder != hud_panelorder_prev) {
-               for(i = 0; i < hud_panels_COUNT; ++i)
-                       panel_order[i] = -1;
-               string s = "";
-               int p_num;
-               bool warning = false;
-               int argc = tokenize_console(autocvar__hud_panelorder);
-               if (argc > hud_panels_COUNT)
-                       warning = true;
-               //first detect wrong/missing panel numbers
-               for(i = 0; i < hud_panels_COUNT; ++i) {
-                       p_num = stoi(argv(i));
-                       if (p_num >= 0 && p_num < hud_panels_COUNT) { //correct panel number?
-                               if (panel_order[p_num] == -1) //found for the first time?
-                                       s = strcat(s, ftos(p_num), " ");
-                               panel_order[p_num] = 1; //mark as found
-                       }
-                       else
-                               warning = true;
-               }
-               for(i = 0; i < hud_panels_COUNT; ++i) {
-                       if (panel_order[i] == -1) {
-                               warning = true;
-                               s = strcat(s, ftos(i), " "); //add missing panel number
-                       }
-               }
-               if (warning)
-                       LOG_TRACE("Automatically fixed wrong/missing panel numbers in _hud_panelorder\n");
-
-               cvar_set("_hud_panelorder", s);
-               if(hud_panelorder_prev)
-                       strunzone(hud_panelorder_prev);
-               hud_panelorder_prev = strzone(s);
-
-               //now properly set panel_order
-               tokenize_console(s);
-               for(i = 0; i < hud_panels_COUNT; ++i) {
-                       panel_order[i] = stof(argv(i));
-               }
-       }
-
-       hud_draw_maximized = 0;
-       // draw panels in the order specified by panel_order array
-       for(i = hud_panels_COUNT - 1; i >= 0; --i)
-               HUD_Panel_Draw(hud_panels_from(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)
-               HUD_Panel_Draw(HUD_PANEL(RADAR));
-       if(autocvar__con_chat_maximized)
-               HUD_Panel_Draw(HUD_PANEL(CHAT));
-       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;
-}
diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh
deleted file mode 100644 (file)
index 5c5a0fe..0000000
+++ /dev/null
@@ -1,420 +0,0 @@
-#ifndef CLIENT_HUD_H
-#define CLIENT_HUD_H
-
-#include "../common/weapons/all.qh"
-
-bool HUD_Radar_Clickable();
-void HUD_Radar_Mouse();
-
-REGISTRY(hud_panels, BITS(6))
-#define hud_panels_from(i) _hud_panels_from(i, NULL)
-REGISTER_REGISTRY(Registerhud_panels)
-
-#define REGISTER_HUD_PANEL(id, draw_func, name, configflags, showflags) \
-       void draw_func(); \
-       REGISTER(Registerhud_panels, HUD_PANEL, hud_panels, id, m_id, new(hud_panel)) { \
-               make_pure(this); \
-               this.panel_id = this.m_id; \
-               this.panel_draw = draw_func; \
-               this.panel_name = #name; \
-               this.panel_configflags = configflags; \
-               this.panel_showflags = showflags; \
-       }
-
-#define HUD_PANEL(NAME) HUD_PANEL_##NAME
-
-// draw the background/borders
-#define HUD_Panel_DrawBg(theAlpha) do {                                                                                                                                                                \
-       if(panel.current_panel_bg != "0" && panel.current_panel_bg != "")                                                                                               \
-               draw_BorderPicture(panel_pos - '1 1 0' * panel_bg_border, panel.current_panel_bg, panel_size + '1 1 0' * 2 * panel_bg_border, panel_bg_color, panel_bg_alpha * theAlpha, '1 1 0' * (panel_bg_border/BORDER_MULTIPLIER));\
-} while(0)
-
-int panel_order[hud_panels_MAX];
-string hud_panelorder_prev;
-
-bool hud_draw_maximized;
-bool hud_panel_radar_maximized;
-bool hud_panel_radar_mouse;
-float hud_panel_radar_bottom;
-bool hud_panel_radar_temp_hidden;
-bool chat_panel_modified;
-bool radar_panel_modified;
-
-float HUD_Radar_InputEvent(float bInputType, float nPrimary, float nSecondary);
-void HUD_Radar_Hide_Maximized();
-
-void HUD_Reset ();
-void HUD_Main ();
-
-int vote_yescount;
-int vote_nocount;
-int vote_needed;
-int vote_highlighted; // currently selected vote
-
-int vote_active; // is there an active vote?
-int vote_prev; // previous state of vote_active to check for a change
-float vote_alpha;
-float vote_change; // "time" when vote_active changed
-
-float hud_panel_quickmenu;
-
-vector mousepos;
-vector panel_click_distance; // mouse cursor distance from the top left corner of the panel (saved only upon a click)
-vector panel_click_resizeorigin; // coordinates for opposite point when resizing
-float resizeCorner; // 1 = topleft, 2 = topright, 3 = bottomleft, 4 = bottomright
-entity highlightedPanel;
-float highlightedAction; // 0 = nothing, 1 = move, 2 = resize
-
-const float BORDER_MULTIPLIER = 0.25;
-float scoreboard_bottom;
-int weapon_accuracy[Weapons_MAX];
-
-int complain_weapon;
-string complain_weapon_name;
-float complain_weapon_type;
-float complain_weapon_time;
-
-int ps_primary, ps_secondary;
-int ts_primary, ts_secondary;
-
-int last_switchweapon;
-int last_activeweapon;
-float weapontime;
-float weaponprevtime;
-
-float teamnagger;
-
-float hud_configure_checkcollisions;
-float hud_configure_prev;
-vector hud_configure_gridSize;
-vector hud_configure_realGridSize;
-
-int hudShiftState;
-const int S_SHIFT = 1;
-const int S_CTRL = 2;
-const int S_ALT = 4;
-
-float menu_enabled; // 1 showing the entire HUD, 2 showing only the clicked panel
-
-float hud_fade_alpha;
-
-string hud_skin_path;
-string hud_skin_prev;
-
-vector myteamcolors;
-
-entity highlightedPanel_backup;
-vector panel_pos_backup;
-vector panel_size_backup;
-
-vector panel_size_copied;
-
-entity panel;
-entityclass(HUDPanel);
-class(HUDPanel) .string panel_name;
-class(HUDPanel) .int panel_id;
-class(HUDPanel) .vector current_panel_pos;
-class(HUDPanel) .vector current_panel_size;
-class(HUDPanel) .string current_panel_bg;
-class(HUDPanel) .float current_panel_bg_alpha;
-class(HUDPanel) .float current_panel_bg_border;
-class(HUDPanel) .vector current_panel_bg_color;
-class(HUDPanel) .float current_panel_bg_color_team;
-class(HUDPanel) .float current_panel_bg_padding;
-class(HUDPanel) .float current_panel_fg_alpha;
-class(HUDPanel) .float update_time;
-float panel_enabled;
-vector panel_pos;
-vector panel_size;
-string panel_bg_str; // "_str" vars contain the raw value of the cvar, non-"_str" contains what hud.qc code should use
-vector panel_bg_color;
-string panel_bg_color_str;
-float panel_bg_color_team;
-string panel_bg_color_team_str;
-float panel_fg_alpha;
-float panel_bg_alpha;
-string panel_bg_alpha_str;
-float panel_bg_border;
-string panel_bg_border_str;
-float panel_bg_padding;
-string panel_bg_padding_str;
-
-class(HUDPanel) .void() panel_draw;
-
-// chat panel can be reduced / moved while the mapvote is active
-// let know the mapvote panel about chat pos and size
-float chat_posy;
-float chat_sizey;
-
-float current_player;
-
-float stringwidth_colors(string s, vector theSize);
-float stringwidth_nocolors(string s, vector theSize);
-float GetPlayerColorForce(int i);
-int GetPlayerColor(int i);
-string GetPlayerName(int i);
-void HUD_Panel_DrawProgressBar(vector theOrigin, vector theSize, string pic, float length_ratio, bool vertical, float baralign, vector theColor, float theAlpha, int drawflag);
-
-.int panel_showflags;
-const int PANEL_SHOW_NEVER    = 0x00;
-const int PANEL_SHOW_MAINGAME = 0x01;
-const int PANEL_SHOW_MINIGAME = 0x02;
-const int PANEL_SHOW_MAPVOTE  = 0x04;
-const int PANEL_SHOW_ALWAYS   = 0xff;
-bool HUD_Panel_CheckFlags(int showflags);
-
-.int panel_configflags;
-const int PANEL_CONFIG_NO    = 0x00;
-const int PANEL_CONFIG_MAIN  = 0x01;
-
-
-// prev_* vars contain the health/armor at the previous FRAME
-// set to -1 when player is dead or was not playing
-int prev_health, prev_armor;
-float health_damagetime, armor_damagetime;
-int health_beforedamage, armor_beforedamage;
-// old_p_* vars keep track of previous values when smoothing value changes of the progressbar
-int old_p_health, old_p_armor;
-float old_p_healthtime, old_p_armortime;
-// prev_p_* vars contain the health/armor progressbar value at the previous FRAME
-// set to -1 to forcedly stop effects when we switch spectated player (e.g. from playerX: 70h to playerY: 50h)
-int prev_p_health, prev_p_armor;
-
-void HUD_ItemsTime();
-
-REGISTER_HUD_PANEL(WEAPONS,         HUD_Weapons,        weapons,        PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(AMMO,            HUD_Ammo,           ammo,           PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(POWERUPS,        HUD_Powerups,       powerups,       PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(HEALTHARMOR,     HUD_HealthArmor,    healtharmor,    PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(NOTIFY,          HUD_Notify,         notify,         PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS & ~PANEL_SHOW_MAPVOTE)
-REGISTER_HUD_PANEL(TIMER,           HUD_Timer,          timer,          PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS & ~PANEL_SHOW_MAPVOTE)
-REGISTER_HUD_PANEL(RADAR,           HUD_Radar,          radar,          PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(SCORE,           HUD_Score,          score,          PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS & ~PANEL_SHOW_MAPVOTE)
-REGISTER_HUD_PANEL(RACETIMER,       HUD_RaceTimer,      racetimer,      PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(VOTE,            HUD_Vote,           vote,           PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS  )
-REGISTER_HUD_PANEL(MODICONS,        HUD_ModIcons,       modicons,       PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(PRESSEDKEYS,     HUD_PressedKeys,    pressedkeys,    PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(CHAT,            HUD_Chat,           chat,           PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS  )
-REGISTER_HUD_PANEL(ENGINEINFO,      HUD_EngineInfo,     engineinfo,     PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS  )
-REGISTER_HUD_PANEL(INFOMESSAGES,    HUD_InfoMessages,   infomessages,   PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(PHYSICS,         HUD_Physics,        physics,        PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(CENTERPRINT,     HUD_CenterPrint,    centerprint,    PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(MINIGAME_BOARD,  HUD_MinigameBoard,  minigameboard,  PANEL_CONFIG_NO  , PANEL_SHOW_MINIGAME)
-REGISTER_HUD_PANEL(MINIGAME_STATUS, HUD_MinigameStatus, minigamestatus, PANEL_CONFIG_NO  , PANEL_SHOW_MINIGAME)
-REGISTER_HUD_PANEL(MINIGAME_HELP,   HUD_MinigameHelp,   minigamehelp,   PANEL_CONFIG_NO  , PANEL_SHOW_MINIGAME)
-REGISTER_HUD_PANEL(MINIGAME_MENU,   HUD_MinigameMenu,   minigamemenu,   PANEL_CONFIG_NO  , PANEL_SHOW_ALWAYS  )
-REGISTER_HUD_PANEL(MAPVOTE,         MapVote_Draw,       mapvote,        PANEL_CONFIG_NO  , PANEL_SHOW_MAPVOTE )
-REGISTER_HUD_PANEL(ITEMSTIME,       HUD_ItemsTime,      itemstime,      PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-REGISTER_HUD_PANEL(QUICKMENU,       HUD_QuickMenu,      quickmenu,      PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
-// always add new panels to the end of list
-
-// Because calling lots of functions in QC apparently cuts fps in half on many machines:
-// ----------------------
-// MACRO HELL STARTS HERE
-// ----------------------
-// Little help for the poor people who have to make sense of this: Start from the bottom ;)
-
-// Get value for panel.current_panel_bg: if "" fetch default, else use panel_bg_str
-// comment on last line of macro: // we probably want to see a background in config mode at all times...
-#define HUD_Panel_GetBg() do {                                                                                      \
-       string panel_bg;                                                                                                \
-       if (!autocvar__hud_configure && panel_bg_str == "0") {                                                          \
-               panel_bg = "0";                                                                                             \
-       } else {                                                                                                        \
-               if (panel_bg_str == "") {                                                                                   \
-                       panel_bg_str = autocvar_hud_panel_bg;                                                                   \
-               }                                                                                                           \
-               if (panel_bg_str == "0" && !autocvar__hud_configure) {                                                      \
-                       panel_bg = "0";                                                                                         \
-               } else {                                                                                                    \
-                       if (panel_bg_str == "0" && autocvar__hud_configure)                                                     \
-                               panel_bg_alpha_str = "0";                                                                           \
-                       panel_bg = strcat(hud_skin_path, "/", panel_bg_str);                                                    \
-                       if (precache_pic(panel_bg) == "") {                                                                     \
-                               panel_bg = strcat(hud_skin_path, "/", "border_default");                                            \
-                               if (precache_pic(panel_bg) == "") {                                                                 \
-                                       panel_bg = strcat("gfx/hud/default/", "border_default");                                        \
-                               }                                                                                                   \
-                       }                                                                                                       \
-               }                                                                                                           \
-       }                                                                                                               \
-       if (panel.current_panel_bg)                                                                                     \
-               strunzone(panel.current_panel_bg);                                                                          \
-       panel.current_panel_bg = strzone(panel_bg);                                                                     \
-} while(0)
-
-// Get value for panel_bg_color: if "" fetch default, else use panel_bg_color. Convert pants, shirt or teamcolor into a vector.
-#define HUD_Panel_GetColor() do {                                                                                   \
-       if ((teamplay) && panel_bg_color_team) {                                                                        \
-               if (autocvar__hud_configure && myteam == NUM_SPECTATOR)                                                     \
-                       panel_bg_color = '1 0 0' * panel_bg_color_team;                                                         \
-               else                                                                                                        \
-                       panel_bg_color = myteamcolors * panel_bg_color_team;                                                    \
-       } else if (autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && panel_bg_color_team) {          \
-               panel_bg_color = '1 0 0' * panel_bg_color_team;                                                             \
-       } else {                                                                                                        \
-               if (panel_bg_color_str == "") {                                                                             \
-                       panel_bg_color = autocvar_hud_panel_bg_color;                                                           \
-               } else {                                                                                                    \
-                       if (panel_bg_color_str == "shirt") {                                                                    \
-                               panel_bg_color = colormapPaletteColor(floor(stof(getplayerkeyvalue(current_player, "colors")) / 16), 0); \
-                       } else if (panel_bg_color_str == "pants") {                                                             \
-                               panel_bg_color = colormapPaletteColor(stof(getplayerkeyvalue(current_player, "colors")) % 16, 1); \
-                       } else {                                                                                                \
-                               panel_bg_color = stov(panel_bg_color_str);                                                          \
-                       }                                                                                                       \
-               }                                                                                                           \
-       }                                                                                                               \
-} while(0)
-
-// Get value for panel_bg_color_team: if "" fetch default, else use panel_bg_color_team_str
-#define HUD_Panel_GetColorTeam() do {                                                                               \
-       if (panel_bg_color_team_str == "") {                                                                            \
-               panel_bg_color_team = autocvar_hud_panel_bg_color_team;                                                     \
-       } else {                                                                                                        \
-               panel_bg_color_team = stof(panel_bg_color_team_str);                                                        \
-       }                                                                                                               \
-} while(0)
-
-// Get value for panel_bg_alpha: if "" fetch default, else use panel_bg_alpha. Also do various menu dialog fadeout/in checks, and minalpha checks
-// comment on line 3 of macro: // do not set a minalpha cap when showing the config dialog for this panel
-#define HUD_Panel_GetBgAlpha() do {                                                                                 \
-       if (panel_bg_alpha_str == "") {                                                                                 \
-               panel_bg_alpha_str = ftos(autocvar_hud_panel_bg_alpha);                                                     \
-       }                                                                                                               \
-       panel_bg_alpha = stof(panel_bg_alpha_str);                                                                      \
-       if (autocvar__hud_configure) {                                                                                  \
-               if (!panel_enabled)                                                                                         \
-                       panel_bg_alpha = 0.25;                                                                                  \
-               else if (menu_enabled == 2 && panel == highlightedPanel)                                                    \
-                       panel_bg_alpha = (1 - autocvar__menu_alpha) * max(cvar("hud_configure_bg_minalpha"), panel_bg_alpha) + autocvar__menu_alpha * panel_bg_alpha;\
-               else                                                                                                        \
-                       panel_bg_alpha = max(cvar("hud_configure_bg_minalpha"), panel_bg_alpha);                                \
-       }                                                                                                               \
-} while(0)
-
-// Get value for panel_fg_alpha. Also do various minalpha checks
-// comment on line 2 of macro: // ALWAYS show disabled panels at 0.25 alpha when in config mode
-#define HUD_Panel_GetFgAlpha() do {                                                                                 \
-       panel_fg_alpha = autocvar_hud_panel_fg_alpha;                                                                   \
-       if (autocvar__hud_configure && !panel_enabled)                                                                  \
-               panel_fg_alpha = 0.25;                                                                                      \
-} while(0)
-
-// Get border. See comments above, it's similar.
-#define HUD_Panel_GetBorder() do {                                                                                  \
-       if (panel_bg_border_str == "") {                                                                                \
-               panel_bg_border = autocvar_hud_panel_bg_border;                                                             \
-       } else {                                                                                                        \
-               panel_bg_border = stof(panel_bg_border_str);                                                                \
-       }                                                                                                               \
-} while(0)
-
-// Get padding. See comments above, it's similar.
-// last line is a port of the old function, basically always make sure the panel contents are at least 5 pixels tall/wide, to disallow extreme padding values
-#define HUD_Panel_GetPadding() do {                                                                                 \
-       if (panel_bg_padding_str == "") {                                                                               \
-               panel_bg_padding = autocvar_hud_panel_bg_padding;                                                           \
-       } else {                                                                                                        \
-               panel_bg_padding = stof(panel_bg_padding_str);                                                              \
-       }                                                                                                               \
-       panel_bg_padding = min(min(panel_size.x, panel_size.y)/2 - 5, panel_bg_padding);                                \
-} while(0)
-
-// return smoothly faded pos and size of given panel when a dialog is active
-// don't center too wide panels, it doesn't work with different resolutions
-#define HUD_Panel_UpdatePosSize_ForMenu() do { \
-       vector menu_enable_size = panel_size; \
-       float max_panel_width = 0.52 * vid_conwidth; \
-       if(panel_size.x > max_panel_width) \
-       { \
-               menu_enable_size.x = max_panel_width; \
-               menu_enable_size.y = panel_size.y * (menu_enable_size.x / panel_size.x); \
-       } \
-       vector menu_enable_pos = eX * (panel_bg_border + 0.5 * max_panel_width) + eY * 0.5 * vid_conheight - 0.5 * menu_enable_size; \
-       panel_pos = (1 - autocvar__menu_alpha) * panel_pos + (autocvar__menu_alpha) * menu_enable_pos; \
-       panel_size = (1 - autocvar__menu_alpha) * panel_size + (autocvar__menu_alpha) * menu_enable_size; \
-} while(0)
-
-// Scale the pos and size vectors to absolute coordinates
-#define HUD_Panel_ScalePosSize() do {                                                                               \
-       panel_pos.x *= vid_conwidth;  panel_pos.y *= vid_conheight;                                                     \
-       panel_size.x *= vid_conwidth; panel_size.y *= vid_conheight;                                                    \
-} while(0)
-
-// NOTE: in hud_configure mode cvars must be reloaded every frame
-#define HUD_Panel_UpdateCvars() do {                                                                                \
-       if (panel.update_time <= time) {                                                                                \
-               if (autocvar__hud_configure) panel_enabled = cvar(strcat("hud_panel_", panel.panel_name));                  \
-               panel_pos = stov(cvar_string(strcat("hud_panel_", panel.panel_name, "_pos")));                              \
-               panel_size = stov(cvar_string(strcat("hud_panel_", panel.panel_name, "_size")));                            \
-               HUD_Panel_ScalePosSize();                                                                                   \
-               panel_bg_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg"));                                  \
-               panel_bg_color_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_color"));                      \
-               panel_bg_color_team_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_color_team"));            \
-               panel_bg_alpha_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_alpha"));                      \
-               panel_bg_border_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_border"));                    \
-               panel_bg_padding_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_padding"));                  \
-               HUD_Panel_GetBg();                                                                                          \
-               if (panel.current_panel_bg != "0") {                                                                        \
-                       HUD_Panel_GetColorTeam();                                                                               \
-                       HUD_Panel_GetColor();                                                                                   \
-                       HUD_Panel_GetBgAlpha();                                                                                 \
-                       HUD_Panel_GetBorder();                                                                                  \
-               }                                                                                                           \
-               HUD_Panel_GetFgAlpha();                                                                                     \
-               HUD_Panel_GetPadding();                                                                                     \
-               panel.current_panel_bg_alpha = panel_bg_alpha;                                                              \
-               panel.current_panel_fg_alpha = panel_fg_alpha;                                                              \
-               if (menu_enabled == 2 && panel == highlightedPanel) {                                                       \
-                       HUD_Panel_UpdatePosSize_ForMenu();                                                                      \
-               } else {                                                                                                    \
-                       panel_bg_alpha *= hud_fade_alpha;                                                                       \
-                       panel_fg_alpha *= hud_fade_alpha;                                                                       \
-               }                                                                                                           \
-               panel.current_panel_pos = panel_pos;                                                                        \
-               panel.current_panel_size = panel_size;                                                                      \
-               panel.current_panel_bg_border = panel_bg_border;                                                            \
-               panel.current_panel_bg_color = panel_bg_color;                                                              \
-               panel.current_panel_bg_color_team = panel_bg_color_team;                                                    \
-               panel.current_panel_bg_padding = panel_bg_padding;                                                          \
-               panel.update_time = (autocvar__hud_configure) ? time : time + autocvar_hud_panel_update_interval;           \
-       } else {                                                                                                        \
-               panel_pos = panel.current_panel_pos;                                                                        \
-               panel_size = panel.current_panel_size;                                                                      \
-               panel_bg_alpha = panel.current_panel_bg_alpha * hud_fade_alpha;                                             \
-               panel_bg_border = panel.current_panel_bg_border;                                                            \
-               panel_bg_color = panel.current_panel_bg_color;                                                              \
-               panel_bg_color_team = panel.current_panel_bg_color_team;                                                    \
-               panel_bg_padding = panel.current_panel_bg_padding;                                                          \
-               panel_fg_alpha = panel.current_panel_fg_alpha * hud_fade_alpha;                                             \
-       }                                                                                                               \
-} while(0)
-
-#define HUD_Panel_UpdatePosSize() do {                                                                              \
-       panel_enabled = cvar(strcat("hud_panel_", panel.panel_name));                                                   \
-       panel_pos = stov(cvar_string(strcat("hud_panel_", panel.panel_name, "_pos")));                                  \
-       panel_size = stov(cvar_string(strcat("hud_panel_", panel.panel_name, "_size")));                                \
-       HUD_Panel_ScalePosSize();                                                                                       \
-       if (menu_enabled == 2 && panel == highlightedPanel) {                                                           \
-               HUD_Panel_UpdatePosSize_ForMenu();                                                                          \
-       }                                                                                                               \
-       panel_bg_border_str = cvar_string(strcat("hud_panel_", panel.panel_name, "_bg_border"));                        \
-       HUD_Panel_GetBorder();                                                                                          \
-} while(0)
-
-const int NOTIFY_MAX_ENTRIES = 10;
-const float NOTIFY_ICON_MARGIN = 0.02;
-
-int notify_index;
-int notify_count;
-float notify_times[NOTIFY_MAX_ENTRIES];
-string notify_attackers[NOTIFY_MAX_ENTRIES];
-string notify_victims[NOTIFY_MAX_ENTRIES];
-string notify_icons[NOTIFY_MAX_ENTRIES];
-
-void HUD_Notify_Push(string icon, string attacker, string victim);
-
-var void HUD_ModIcons_GameType(vector pos, vector size);
-void HUD_ModIcons_SetFunc();
-#endif
diff --git a/qcsrc/client/hud/all.inc b/qcsrc/client/hud/all.inc
new file mode 100644 (file)
index 0000000..aa36eec
--- /dev/null
@@ -0,0 +1,21 @@
+#include "panel/weapons.qc"
+#include "panel/ammo.qc"
+#include "panel/powerups.qc"
+#include "panel/healtharmor.qc"
+#include "panel/notify.qc"
+#include "panel/timer.qc"
+#include "panel/radar.qc"
+#include "panel/score.qc"
+#include "panel/racetimer.qc"
+#include "panel/vote.qc"
+#include "panel/modicons.qc"
+#include "panel/pressedkeys.qc"
+#include "panel/chat.qc"
+#include "panel/engineinfo.qc"
+#include "panel/infomessages.qc"
+#include "panel/physics.qc"
+#include "panel/centerprint.qc"
+#include "panel/minigame.qc"
+// #include "panel/mapvote.qc"
+// #include "panel/itemstime.qc"
+#include "panel/quickmenu.qc"
diff --git a/qcsrc/client/hud/all.qc b/qcsrc/client/hud/all.qc
new file mode 100644 (file)
index 0000000..680b023
--- /dev/null
@@ -0,0 +1,2 @@
+#include "hud.qc"
+#include "hud_config.qc"
diff --git a/qcsrc/client/hud/all.qh b/qcsrc/client/hud/all.qh
new file mode 100644 (file)
index 0000000..4f8cee5
--- /dev/null
@@ -0,0 +1,2 @@
+#include "hud.qh"
+#include "hud_config.qh"
diff --git a/qcsrc/client/hud/hud.qc b/qcsrc/client/hud/hud.qc
new file mode 100644 (file)
index 0000000..1054e9b
--- /dev/null
@@ -0,0 +1,602 @@
+#include "hud.qh"
+
+#include "hud_config.qh"
+#include "mapvoting.qh"
+#include "scoreboard.qh"
+#include "teamradar.qh"
+#include "t_items.qh"
+#include "../common/buffs/all.qh"
+#include "../common/deathtypes/all.qh"
+#include "../common/items/all.qc"
+#include "../common/mapinfo.qh"
+#include "../common/mutators/mutator/waypoints/all.qh"
+#include "../common/nades/all.qh"
+#include "../common/stats.qh"
+#include "../lib/csqcmodel/cl_player.qh"
+// TODO: remove
+#include "../server/mutators/mutator/gamemode_ctf.qc"
+
+
+/*
+==================
+Misc HUD functions
+==================
+*/
+
+vector HUD_Get_Num_Color (float x, float maxvalue)
+{
+       float blinkingamt;
+       vector color;
+       if(x >= maxvalue) {
+               color.x = sin(2*M_PI*time);
+               color.y = 1;
+               color.z = sin(2*M_PI*time);
+       }
+       else if(x > maxvalue * 0.75) {
+               color.x = 0.4 - (x-150)*0.02 * 0.4; //red value between 0.4 -> 0
+               color.y = 0.9 + (x-150)*0.02 * 0.1; // green value between 0.9 -> 1
+               color.z = 0;
+       }
+       else if(x > maxvalue * 0.5) {
+               color.x = 1 - (x-100)*0.02 * 0.6; //red value between 1 -> 0.4
+               color.y = 1 - (x-100)*0.02 * 0.1; // green value between 1 -> 0.9
+               color.z = 1 - (x-100)*0.02; // blue value between 1 -> 0
+       }
+       else if(x > maxvalue * 0.25) {
+               color.x = 1;
+               color.y = 1;
+               color.z = 0.2 + (x-50)*0.02 * 0.8; // blue value between 0.2 -> 1
+       }
+       else if(x > maxvalue * 0.1) {
+               color.x = 1;
+               color.y = (x-20)*90/27/100; // green value between 0 -> 1
+               color.z = (x-20)*90/27/100 * 0.2; // blue value between 0 -> 0.2
+       }
+       else {
+               color.x = 1;
+               color.y = 0;
+               color.z = 0;
+       }
+
+       blinkingamt = (1 - x/maxvalue/0.25);
+       if(blinkingamt > 0)
+       {
+               color.x = color.x - color.x * blinkingamt * sin(2*M_PI*time);
+               color.y = color.y - color.y * blinkingamt * sin(2*M_PI*time);
+               color.z = color.z - color.z * blinkingamt * sin(2*M_PI*time);
+       }
+       return color;
+}
+
+float HUD_GetRowCount(int item_count, vector size, float item_aspect)
+{
+       float aspect = size_y / size_x;
+       return bound(1, floor((sqrt(4 * item_aspect * aspect * item_count + aspect * aspect) + aspect + 0.5) / 2), item_count);
+}
+
+vector HUD_GetTableSize_BestItemAR(int item_count, vector psize, float item_aspect)
+{
+       float columns, rows;
+       float ratio, best_ratio = 0;
+       float best_columns = 1, best_rows = 1;
+       bool vertical = (psize.x / psize.y >= item_aspect);
+       if(vertical)
+       {
+               psize = eX * psize.y + eY * psize.x;
+               item_aspect = 1 / item_aspect;
+       }
+
+       rows = ceil(sqrt(item_count));
+       columns = ceil(item_count/rows);
+       while(columns >= 1)
+       {
+               ratio = (psize.x/columns) / (psize.y/rows);
+               if(ratio > item_aspect)
+                       ratio = item_aspect * item_aspect / ratio;
+
+               if(ratio <= best_ratio)
+                       break; // ratio starts decreasing by now, skip next configurations
+
+               best_columns = columns;
+               best_rows = rows;
+               best_ratio = ratio;
+
+               if(columns == 1)
+                       break;
+
+               --columns;
+               rows = ceil(item_count/columns);
+       }
+
+       if(vertical)
+               return eX * best_rows + eY * best_columns;
+       else
+               return eX * best_columns + eY * best_rows;
+}
+
+// return the string of the onscreen race timer
+string MakeRaceString(int cp, float mytime, float theirtime, float lapdelta, string theirname)
+{
+       string col;
+       string timestr;
+       string cpname;
+       string lapstr;
+       lapstr = "";
+
+       if(theirtime == 0) // goal hit
+       {
+               if(mytime > 0)
+               {
+                       timestr = strcat("+", ftos_decimals(+mytime, TIME_DECIMALS));
+                       col = "^1";
+               }
+               else if(mytime == 0)
+               {
+                       timestr = "+0.0";
+                       col = "^3";
+               }
+               else
+               {
+                       timestr = strcat("-", ftos_decimals(-mytime, TIME_DECIMALS));
+                       col = "^2";
+               }
+
+               if(lapdelta > 0)
+               {
+                       lapstr = sprintf(_(" (-%dL)"), lapdelta);
+                       col = "^2";
+               }
+               else if(lapdelta < 0)
+               {
+                       lapstr = sprintf(_(" (+%dL)"), -lapdelta);
+                       col = "^1";
+               }
+       }
+       else if(theirtime > 0) // anticipation
+       {
+               if(mytime >= theirtime)
+                       timestr = strcat("+", ftos_decimals(mytime - theirtime, TIME_DECIMALS));
+               else
+                       timestr = TIME_ENCODED_TOSTRING(TIME_ENCODE(theirtime));
+               col = "^3";
+       }
+       else
+       {
+               col = "^7";
+               timestr = "";
+       }
+
+       if(cp == 254)
+               cpname = _("Start line");
+       else if(cp == 255)
+               cpname = _("Finish line");
+       else if(cp)
+               cpname = sprintf(_("Intermediate %d"), cp);
+       else
+               cpname = _("Finish line");
+
+       if(theirtime < 0)
+               return strcat(col, cpname);
+       else if(theirname == "")
+               return strcat(col, sprintf("%s (%s)", cpname, timestr));
+       else
+               return strcat(col, sprintf("%s (%s %s)", cpname, timestr, strcat(theirname, col, lapstr)));
+}
+
+// Check if the given name already exist in race rankings? In that case, where? (otherwise return 0)
+int race_CheckName(string net_name)
+{
+       int i;
+       for (i=RANKINGS_CNT-1;i>=0;--i)
+               if(grecordholder[i] == net_name)
+                       return i+1;
+       return 0;
+}
+
+/*
+==================
+HUD panels
+==================
+*/
+
+//basically the same code of draw_ButtonPicture and draw_VertButtonPicture for the menu
+void HUD_Panel_DrawProgressBar(vector theOrigin, vector theSize, string pic, float length_ratio, bool vertical, float baralign, vector theColor, float theAlpha, int drawflag)
+{
+       if(!length_ratio || !theAlpha)
+               return;
+       if(length_ratio > 1)
+               length_ratio = 1;
+       if (baralign == 3)
+       {
+               if(length_ratio < -1)
+                       length_ratio = -1;
+       }
+       else if(length_ratio < 0)
+               return;
+
+       vector square;
+       vector width, height;
+       if(vertical) {
+               pic = strcat(hud_skin_path, "/", pic, "_vertical");
+               if(precache_pic(pic) == "") {
+                       pic = "gfx/hud/default/progressbar_vertical";
+               }
+
+        if (baralign == 1) // bottom align
+                       theOrigin.y += (1 - length_ratio) * theSize.y;
+        else if (baralign == 2) // center align
+            theOrigin.y += 0.5 * (1 - length_ratio) * theSize.y;
+        else if (baralign == 3) // center align, positive values down, negative up
+               {
+                       theSize.y *= 0.5;
+                       if (length_ratio > 0)
+                               theOrigin.y += theSize.y;
+                       else
+                       {
+                               theOrigin.y += (1 + length_ratio) * theSize.y;
+                               length_ratio = -length_ratio;
+                       }
+               }
+               theSize.y *= length_ratio;
+
+               vector bH;
+               width = eX * theSize.x;
+               height = eY * theSize.y;
+               if(theSize.y <= theSize.x * 2)
+               {
+                       // button not high enough
+                       // draw just upper and lower part then
+                       square = eY * theSize.y * 0.5;
+                       bH = eY * (0.25 * theSize.y / (theSize.x * 2));
+                       drawsubpic(theOrigin,          square + width, pic, '0 0 0', eX + bH, theColor, theAlpha, drawflag);
+                       drawsubpic(theOrigin + square, square + width, pic, eY - bH, eX + bH, theColor, theAlpha, drawflag);
+               }
+               else
+               {
+                       square = eY * theSize.x;
+                       drawsubpic(theOrigin,                   width   +     square, pic, '0 0    0', '1 0.25 0', theColor, theAlpha, drawflag);
+                       drawsubpic(theOrigin +          square, theSize - 2 * square, pic, '0 0.25 0', '1 0.5  0', theColor, theAlpha, drawflag);
+                       drawsubpic(theOrigin + height - square, width   +     square, pic, '0 0.75 0', '1 0.25 0', theColor, theAlpha, drawflag);
+               }
+       } else {
+               pic = strcat(hud_skin_path, "/", pic);
+               if(precache_pic(pic) == "") {
+                       pic = "gfx/hud/default/progressbar";
+               }
+
+               if (baralign == 1) // right align
+                       theOrigin.x += (1 - length_ratio) * theSize.x;
+        else if (baralign == 2) // center align
+            theOrigin.x += 0.5 * (1 - length_ratio) * theSize.x;
+        else if (baralign == 3) // center align, positive values on the right, negative on the left
+               {
+                       theSize.x *= 0.5;
+                       if (length_ratio > 0)
+                               theOrigin.x += theSize.x;
+                       else
+                       {
+                               theOrigin.x += (1 + length_ratio) * theSize.x;
+                               length_ratio = -length_ratio;
+                       }
+               }
+               theSize.x *= length_ratio;
+
+               vector bW;
+               width = eX * theSize.x;
+               height = eY * theSize.y;
+               if(theSize.x <= theSize.y * 2)
+               {
+                       // button not wide enough
+                       // draw just left and right part then
+                       square = eX * theSize.x * 0.5;
+                       bW = eX * (0.25 * theSize.x / (theSize.y * 2));
+                       drawsubpic(theOrigin,          square + height, pic, '0 0 0', eY + bW, theColor, theAlpha, drawflag);
+                       drawsubpic(theOrigin + square, square + height, pic, eX - bW, eY + bW, theColor, theAlpha, drawflag);
+               }
+               else
+               {
+                       square = eX * theSize.y;
+                       drawsubpic(theOrigin,                  height  +     square, pic, '0    0 0', '0.25 1 0', theColor, theAlpha, drawflag);
+                       drawsubpic(theOrigin +         square, theSize - 2 * square, pic, '0.25 0 0', '0.5  1 0', theColor, theAlpha, drawflag);
+                       drawsubpic(theOrigin + width - square, height  +     square, pic, '0.75 0 0', '0.25 1 0', theColor, theAlpha, drawflag);
+               }
+       }
+}
+
+void HUD_Panel_DrawHighlight(vector pos, vector mySize, vector color, float theAlpha, int drawflag)
+{
+       if(!theAlpha)
+               return;
+
+       string pic;
+       pic = strcat(hud_skin_path, "/num_leading");
+       if(precache_pic(pic) == "") {
+               pic = "gfx/hud/default/num_leading";
+       }
+
+       drawsubpic(pos, eX * min(mySize.x * 0.5, mySize.y) + eY * mySize.y, pic, '0 0 0', '0.25 1 0', color, theAlpha, drawflag);
+       if(mySize.x/mySize.y > 2)
+               drawsubpic(pos + eX * mySize.y, eX * (mySize.x - 2 * mySize.y) + eY * mySize.y, pic, '0.25 0 0', '0.5 1 0', color, theAlpha, drawflag);
+       drawsubpic(pos + eX * mySize.x - eX * min(mySize.x * 0.5, mySize.y), eX * min(mySize.x * 0.5, mySize.y) + eY * mySize.y, pic, '0.75 0 0', '0.25 1 0', color, theAlpha, drawflag);
+}
+
+void DrawNumIcon_expanding(vector myPos, vector mySize, float x, string icon, bool vertical, bool icon_right_align, vector color, float theAlpha, float fadelerp)
+{
+       vector newPos = '0 0 0', newSize = '0 0 0';
+       vector picpos, numpos;
+
+       if (vertical)
+       {
+               if(mySize.y/mySize.x > 2)
+               {
+                       newSize.y = 2 * mySize.x;
+                       newSize.x = mySize.x;
+
+                       newPos.y = myPos.y + (mySize.y - newSize.y) / 2;
+                       newPos.x = myPos.x;
+               }
+               else
+               {
+                       newSize.x = 1/2 * mySize.y;
+                       newSize.y = mySize.y;
+
+                       newPos.x = myPos.x + (mySize.x - newSize.x) / 2;
+                       newPos.y = myPos.y;
+               }
+
+               if(icon_right_align)
+               {
+                       numpos = newPos;
+                       picpos = newPos + eY * newSize.x;
+               }
+               else
+               {
+                       picpos = newPos;
+                       numpos = newPos + eY * newSize.x;
+               }
+
+               newSize.y /= 2;
+               drawpic_aspect_skin(picpos, icon, newSize, '1 1 1', panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL);
+               // make number smaller than icon, it looks better
+               // reduce only y to draw numbers with different number of digits with the same y size
+               numpos.y += newSize.y * ((1 - 0.7) / 2);
+               newSize.y *= 0.7;
+               drawstring_aspect(numpos, ftos(x), newSize, color, panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL);
+               return;
+       }
+
+       if(mySize.x/mySize.y > 3)
+       {
+               newSize.x = 3 * mySize.y;
+               newSize.y = mySize.y;
+
+               newPos.x = myPos.x + (mySize.x - newSize.x) / 2;
+               newPos.y = myPos.y;
+       }
+       else
+       {
+               newSize.y = 1/3 * mySize.x;
+               newSize.x = mySize.x;
+
+               newPos.y = myPos.y + (mySize.y - newSize.y) / 2;
+               newPos.x = myPos.x;
+       }
+
+       if(icon_right_align) // right align
+       {
+               numpos = newPos;
+               picpos = newPos + eX * 2 * newSize.y;
+       }
+       else // left align
+       {
+               numpos = newPos + eX * newSize.y;
+               picpos = newPos;
+       }
+
+       // NOTE: newSize_x is always equal to 3 * mySize_y so we can use
+       // '2 1 0' * newSize_y instead of eX * (2/3) * newSize_x + eY * newSize_y
+       drawstring_aspect_expanding(numpos, ftos(x), '2 1 0' * newSize.y, color, panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL, fadelerp);
+       drawpic_aspect_skin_expanding(picpos, icon, '1 1 0' * newSize.y, '1 1 1', panel_fg_alpha * theAlpha, DRAWFLAG_NORMAL, fadelerp);
+}
+
+void DrawNumIcon(vector myPos, vector mySize, float x, string icon, bool vertical, bool icon_right_align, vector color, float theAlpha)
+{
+       DrawNumIcon_expanding(myPos, mySize, x, icon, vertical, icon_right_align, color, theAlpha, 0);
+}
+
+#include "all.inc"
+
+/*
+==================
+Main HUD system
+==================
+*/
+
+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(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()
+{
+       // reset gametype specific icons
+       if(gametype == MAPINFO_TYPE_CTF)
+               HUD_Mod_CTF_Reset();
+}
+
+void HUD_Main()
+{
+       int i;
+       // global hud theAlpha fade
+       if(menu_enabled == 1)
+               hud_fade_alpha = 1;
+       else
+               hud_fade_alpha = (1 - autocvar__menu_alpha);
+
+       if(scoreboard_fade_alpha)
+               hud_fade_alpha = (1 - scoreboard_fade_alpha);
+
+       HUD_Configure_Frame();
+
+       // panels that we want to be active together with the scoreboard
+       // they must fade only when the menu does
+       if(scoreboard_fade_alpha == 1)
+       {
+               HUD_Panel_Draw(HUD_PANEL(CENTERPRINT));
+               return;
+       }
+
+       if(!autocvar__hud_configure && !hud_fade_alpha)
+       {
+               hud_fade_alpha = 1;
+               HUD_Panel_Draw(HUD_PANEL(VOTE));
+               hud_fade_alpha = 0;
+               return;
+       }
+
+       // Drawing stuff
+       if (hud_skin_prev != autocvar_hud_skin)
+       {
+               if (hud_skin_path)
+                       strunzone(hud_skin_path);
+               hud_skin_path = strzone(strcat("gfx/hud/", autocvar_hud_skin));
+               if (hud_skin_prev)
+                       strunzone(hud_skin_prev);
+               hud_skin_prev = strzone(autocvar_hud_skin);
+       }
+
+       // draw the dock
+       if(autocvar_hud_dock != "" && autocvar_hud_dock != "0")
+       {
+               int f;
+               vector color;
+               float hud_dock_color_team = autocvar_hud_dock_color_team;
+               if((teamplay) && hud_dock_color_team) {
+                       if(autocvar__hud_configure && myteam == NUM_SPECTATOR)
+                               color = '1 0 0' * hud_dock_color_team;
+                       else
+                               color = myteamcolors * hud_dock_color_team;
+               }
+               else if(autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && hud_dock_color_team) {
+                       color = '1 0 0' * hud_dock_color_team;
+               }
+               else
+               {
+                       string hud_dock_color = autocvar_hud_dock_color;
+                       if(hud_dock_color == "shirt") {
+                               f = stof(getplayerkeyvalue(current_player, "colors"));
+                               color = colormapPaletteColor(floor(f / 16), 0);
+                       }
+                       else if(hud_dock_color == "pants") {
+                               f = stof(getplayerkeyvalue(current_player, "colors"));
+                               color = colormapPaletteColor(f % 16, 1);
+                       }
+                       else
+                               color = stov(hud_dock_color);
+               }
+
+               string pic;
+               pic = strcat(hud_skin_path, "/", autocvar_hud_dock);
+               if(precache_pic(pic) == "") {
+                       pic = strcat(hud_skin_path, "/dock_medium");
+                       if(precache_pic(pic) == "") {
+                               pic = "gfx/hud/default/dock_medium";
+                       }
+               }
+               drawpic('0 0 0', pic, eX * vid_conwidth + eY * vid_conheight, color, autocvar_hud_dock_alpha * hud_fade_alpha, DRAWFLAG_NORMAL); // no aspect ratio forcing on dock...
+       }
+
+       // cache the panel order into the panel_order array
+       if(autocvar__hud_panelorder != hud_panelorder_prev) {
+               for(i = 0; i < hud_panels_COUNT; ++i)
+                       panel_order[i] = -1;
+               string s = "";
+               int p_num;
+               bool warning = false;
+               int argc = tokenize_console(autocvar__hud_panelorder);
+               if (argc > hud_panels_COUNT)
+                       warning = true;
+               //first detect wrong/missing panel numbers
+               for(i = 0; i < hud_panels_COUNT; ++i) {
+                       p_num = stoi(argv(i));
+                       if (p_num >= 0 && p_num < hud_panels_COUNT) { //correct panel number?
+                               if (panel_order[p_num] == -1) //found for the first time?
+                                       s = strcat(s, ftos(p_num), " ");
+                               panel_order[p_num] = 1; //mark as found
+                       }
+                       else
+                               warning = true;
+               }
+               for(i = 0; i < hud_panels_COUNT; ++i) {
+                       if (panel_order[i] == -1) {
+                               warning = true;
+                               s = strcat(s, ftos(i), " "); //add missing panel number
+                       }
+               }
+               if (warning)
+                       LOG_TRACE("Automatically fixed wrong/missing panel numbers in _hud_panelorder\n");
+
+               cvar_set("_hud_panelorder", s);
+               if(hud_panelorder_prev)
+                       strunzone(hud_panelorder_prev);
+               hud_panelorder_prev = strzone(s);
+
+               //now properly set panel_order
+               tokenize_console(s);
+               for(i = 0; i < hud_panels_COUNT; ++i) {
+                       panel_order[i] = stof(argv(i));
+               }
+       }
+
+       hud_draw_maximized = 0;
+       // draw panels in the order specified by panel_order array
+       for(i = hud_panels_COUNT - 1; i >= 0; --i)
+               HUD_Panel_Draw(hud_panels_from(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)
+               HUD_Panel_Draw(HUD_PANEL(RADAR));
+       if(autocvar__con_chat_maximized)
+               HUD_Panel_Draw(HUD_PANEL(CHAT));
+       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;
+}
diff --git a/qcsrc/client/hud/hud.qh b/qcsrc/client/hud/hud.qh
new file mode 100644 (file)
index 0000000..5c5a0fe
--- /dev/null
@@ -0,0 +1,420 @@
+#ifndef CLIENT_HUD_H
+#define CLIENT_HUD_H
+
+#include "../common/weapons/all.qh"
+
+bool HUD_Radar_Clickable();
+void HUD_Radar_Mouse();
+
+REGISTRY(hud_panels, BITS(6))
+#define hud_panels_from(i) _hud_panels_from(i, NULL)
+REGISTER_REGISTRY(Registerhud_panels)
+
+#define REGISTER_HUD_PANEL(id, draw_func, name, configflags, showflags) \
+       void draw_func(); \
+       REGISTER(Registerhud_panels, HUD_PANEL, hud_panels, id, m_id, new(hud_panel)) { \
+               make_pure(this); \
+               this.panel_id = this.m_id; \
+               this.panel_draw = draw_func; \
+               this.panel_name = #name; \
+               this.panel_configflags = configflags; \
+               this.panel_showflags = showflags; \
+       }
+
+#define HUD_PANEL(NAME) HUD_PANEL_##NAME
+
+// draw the background/borders
+#define HUD_Panel_DrawBg(theAlpha) do {                                                                                                                                                                \
+       if(panel.current_panel_bg != "0" && panel.current_panel_bg != "")                                                                                               \
+               draw_BorderPicture(panel_pos - '1 1 0' * panel_bg_border, panel.current_panel_bg, panel_size + '1 1 0' * 2 * panel_bg_border, panel_bg_color, panel_bg_alpha * theAlpha, '1 1 0' * (panel_bg_border/BORDER_MULTIPLIER));\
+} while(0)
+
+int panel_order[hud_panels_MAX];
+string hud_panelorder_prev;
+
+bool hud_draw_maximized;
+bool hud_panel_radar_maximized;
+bool hud_panel_radar_mouse;
+float hud_panel_radar_bottom;
+bool hud_panel_radar_temp_hidden;
+bool chat_panel_modified;
+bool radar_panel_modified;
+
+float HUD_Radar_InputEvent(float bInputType, float nPrimary, float nSecondary);
+void HUD_Radar_Hide_Maximized();
+
+void HUD_Reset ();
+void HUD_Main ();
+
+int vote_yescount;
+int vote_nocount;
+int vote_needed;
+int vote_highlighted; // currently selected vote
+
+int vote_active; // is there an active vote?
+int vote_prev; // previous state of vote_active to check for a change
+float vote_alpha;
+float vote_change; // "time" when vote_active changed
+
+float hud_panel_quickmenu;
+
+vector mousepos;
+vector panel_click_distance; // mouse cursor distance from the top left corner of the panel (saved only upon a click)
+vector panel_click_resizeorigin; // coordinates for opposite point when resizing
+float resizeCorner; // 1 = topleft, 2 = topright, 3 = bottomleft, 4 = bottomright
+entity highlightedPanel;
+float highlightedAction; // 0 = nothing, 1 = move, 2 = resize
+
+const float BORDER_MULTIPLIER = 0.25;
+float scoreboard_bottom;
+int weapon_accuracy[Weapons_MAX];
+
+int complain_weapon;
+string complain_weapon_name;
+float complain_weapon_type;
+float complain_weapon_time;
+
+int ps_primary, ps_secondary;
+int ts_primary, ts_secondary;
+
+int last_switchweapon;
+int last_activeweapon;
+float weapontime;
+float weaponprevtime;
+
+float teamnagger;
+
+float hud_configure_checkcollisions;
+float hud_configure_prev;
+vector hud_configure_gridSize;
+vector hud_configure_realGridSize;
+
+int hudShiftState;
+const int S_SHIFT = 1;
+const int S_CTRL = 2;
+const int S_ALT = 4;
+
+float menu_enabled; // 1 showing the entire HUD, 2 showing only the clicked panel
+
+float hud_fade_alpha;
+
+string hud_skin_path;
+string hud_skin_prev;
+
+vector myteamcolors;
+
+entity highlightedPanel_backup;
+vector panel_pos_backup;
+vector panel_size_backup;
+
+vector panel_size_copied;
+
+entity panel;
+entityclass(HUDPanel);
+class(HUDPanel) .string panel_name;
+class(HUDPanel) .int panel_id;
+class(HUDPanel) .vector current_panel_pos;
+class(HUDPanel) .vector current_panel_size;
+class(HUDPanel) .string current_panel_bg;
+class(HUDPanel) .float current_panel_bg_alpha;
+class(HUDPanel) .float current_panel_bg_border;
+class(HUDPanel) .vector current_panel_bg_color;
+class(HUDPanel) .float current_panel_bg_color_team;
+class(HUDPanel) .float current_panel_bg_padding;
+class(HUDPanel) .float current_panel_fg_alpha;
+class(HUDPanel) .float update_time;
+float panel_enabled;
+vector panel_pos;
+vector panel_size;
+string panel_bg_str; // "_str" vars contain the raw value of the cvar, non-"_str" contains what hud.qc code should use
+vector panel_bg_color;
+string panel_bg_color_str;
+float panel_bg_color_team;
+string panel_bg_color_team_str;
+float panel_fg_alpha;
+float panel_bg_alpha;
+string panel_bg_alpha_str;
+float panel_bg_border;
+string panel_bg_border_str;
+float panel_bg_padding;
+string panel_bg_padding_str;
+
+class(HUDPanel) .void() panel_draw;
+
+// chat panel can be reduced / moved while the mapvote is active
+// let know the mapvote panel about chat pos and size
+float chat_posy;
+float chat_sizey;
+
+float current_player;
+
+float stringwidth_colors(string s, vector theSize);
+float stringwidth_nocolors(string s, vector theSize);
+float GetPlayerColorForce(int i);
+int GetPlayerColor(int i);
+string GetPlayerName(int i);
+void HUD_Panel_DrawProgressBar(vector theOrigin, vector theSize, string pic, float length_ratio, bool vertical, float baralign, vector theColor, float theAlpha, int drawflag);
+
+.int panel_showflags;
+const int PANEL_SHOW_NEVER    = 0x00;
+const int PANEL_SHOW_MAINGAME = 0x01;
+const int PANEL_SHOW_MINIGAME = 0x02;
+const int PANEL_SHOW_MAPVOTE  = 0x04;
+const int PANEL_SHOW_ALWAYS   = 0xff;
+bool HUD_Panel_CheckFlags(int showflags);
+
+.int panel_configflags;
+const int PANEL_CONFIG_NO    = 0x00;
+const int PANEL_CONFIG_MAIN  = 0x01;
+
+
+// prev_* vars contain the health/armor at the previous FRAME
+// set to -1 when player is dead or was not playing
+int prev_health, prev_armor;
+float health_damagetime, armor_damagetime;
+int health_beforedamage, armor_beforedamage;
+// old_p_* vars keep track of previous values when smoothing value changes of the progressbar
+int old_p_health, old_p_armor;
+float old_p_healthtime, old_p_armortime;
+// prev_p_* vars contain the health/armor progressbar value at the previous FRAME
+// set to -1 to forcedly stop effects when we switch spectated player (e.g. from playerX: 70h to playerY: 50h)
+int prev_p_health, prev_p_armor;
+
+void HUD_ItemsTime();
+
+REGISTER_HUD_PANEL(WEAPONS,         HUD_Weapons,        weapons,        PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
+REGISTER_HUD_PANEL(AMMO,            HUD_Ammo,           ammo,           PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
+REGISTER_HUD_PANEL(POWERUPS,        HUD_Powerups,       powerups,       PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
+REGISTER_HUD_PANEL(HEALTHARMOR,     HUD_HealthArmor,    healtharmor,    PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
+REGISTER_HUD_PANEL(NOTIFY,          HUD_Notify,         notify,         PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS & ~PANEL_SHOW_MAPVOTE)
+REGISTER_HUD_PANEL(TIMER,           HUD_Timer,          timer,          PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS & ~PANEL_SHOW_MAPVOTE)
+REGISTER_HUD_PANEL(RADAR,           HUD_Radar,          radar,          PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
+REGISTER_HUD_PANEL(SCORE,           HUD_Score,          score,          PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS & ~PANEL_SHOW_MAPVOTE)
+REGISTER_HUD_PANEL(RACETIMER,       HUD_RaceTimer,      racetimer,      PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
+REGISTER_HUD_PANEL(VOTE,            HUD_Vote,           vote,           PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS  )
+REGISTER_HUD_PANEL(MODICONS,        HUD_ModIcons,       modicons,       PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
+REGISTER_HUD_PANEL(PRESSEDKEYS,     HUD_PressedKeys,    pressedkeys,    PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
+REGISTER_HUD_PANEL(CHAT,            HUD_Chat,           chat,           PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS  )
+REGISTER_HUD_PANEL(ENGINEINFO,      HUD_EngineInfo,     engineinfo,     PANEL_CONFIG_MAIN, PANEL_SHOW_ALWAYS  )
+REGISTER_HUD_PANEL(INFOMESSAGES,    HUD_InfoMessages,   infomessages,   PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
+REGISTER_HUD_PANEL(PHYSICS,         HUD_Physics,        physics,        PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
+REGISTER_HUD_PANEL(CENTERPRINT,     HUD_CenterPrint,    centerprint,    PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
+REGISTER_HUD_PANEL(MINIGAME_BOARD,  HUD_MinigameBoard,  minigameboard,  PANEL_CONFIG_NO  , PANEL_SHOW_MINIGAME)
+REGISTER_HUD_PANEL(MINIGAME_STATUS, HUD_MinigameStatus, minigamestatus, PANEL_CONFIG_NO  , PANEL_SHOW_MINIGAME)
+REGISTER_HUD_PANEL(MINIGAME_HELP,   HUD_MinigameHelp,   minigamehelp,   PANEL_CONFIG_NO  , PANEL_SHOW_MINIGAME)
+REGISTER_HUD_PANEL(MINIGAME_MENU,   HUD_MinigameMenu,   minigamemenu,   PANEL_CONFIG_NO  , PANEL_SHOW_ALWAYS  )
+REGISTER_HUD_PANEL(MAPVOTE,         MapVote_Draw,       mapvote,        PANEL_CONFIG_NO  , PANEL_SHOW_MAPVOTE )
+REGISTER_HUD_PANEL(ITEMSTIME,       HUD_ItemsTime,      itemstime,      PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
+REGISTER_HUD_PANEL(QUICKMENU,       HUD_QuickMenu,      quickmenu,      PANEL_CONFIG_MAIN, PANEL_SHOW_MAINGAME)
+// always add new panels to the end of list
+
+// Because calling lots of functions in QC apparently cuts fps in half on many machines:
+// ----------------------
+// MACRO HELL STARTS HERE
+// ----------------------
+// Little help for the poor people who have to make sense of this: Start from the bottom ;)
+
+// Get value for panel.current_panel_bg: if "" fetch default, else use panel_bg_str
+// comment on last line of macro: // we probably want to see a background in config mode at all times...
+#define HUD_Panel_GetBg() do {                                                                                      \
+       string panel_bg;                                                                                                \
+       if (!autocvar__hud_configure && panel_bg_str == "0") {                                                          \
+               panel_bg = "0";                                                                                             \
+       } else {                                                                                                        \
+               if (panel_bg_str == "") {                                                                                   \
+                       panel_bg_str = autocvar_hud_panel_bg;                                                                   \
+               }                                                                                                           \
+               if (panel_bg_str == "0" && !autocvar__hud_configure) {                                                      \
+                       panel_bg = "0";                                                                                         \
+               } else {                                                                                                    \
+                       if (panel_bg_str == "0" && autocvar__hud_configure)                                                     \
+                               panel_bg_alpha_str = "0";                                                                           \
+                       panel_bg = strcat(hud_skin_path, "/", panel_bg_str);                                                    \
+                       if (precache_pic(panel_bg) == "") {                                                                     \
+                               panel_bg = strcat(hud_skin_path, "/", "border_default");                                            \
+                               if (precache_pic(panel_bg) == "") {                                                                 \
+                                       panel_bg = strcat("gfx/hud/default/", "border_default");                                        \
+                               }                                                                                                   \
+                       }                                                                                                       \
+               }                                                                                                           \
+       }                                                                                                               \
+       if (panel.current_panel_bg)                                                                                     \
+               strunzone(panel.current_panel_bg);                                                                          \
+       panel.current_panel_bg = strzone(panel_bg);                                                                     \
+} while(0)
+
+// Get value for panel_bg_color: if "" fetch default, else use panel_bg_color. Convert pants, shirt or teamcolor into a vector.
+#define HUD_Panel_GetColor() do {                                                                                   \
+       if ((teamplay) && panel_bg_color_team) {                                                                        \
+               if (autocvar__hud_configure && myteam == NUM_SPECTATOR)                                                     \
+                       panel_bg_color = '1 0 0' * panel_bg_color_team;                                                         \
+               else                                                                                                        \
+                       panel_bg_color = myteamcolors * panel_bg_color_team;                                                    \
+       } else if (autocvar_hud_configure_teamcolorforced && autocvar__hud_configure && panel_bg_color_team) {          \
+               panel_bg_color = '1 0 0' * panel_bg_color_team;                                                             \
+       } else {                                                                                                        \
+               if (panel_bg_color_str == "") {                                                                             \
+                       panel_bg_color = autocvar_hud_panel_bg_color;                                                           \
+               } else {                                                                                                    \
+                       if (panel_bg_color_str == "shirt") {                                                                    \
+                               panel_bg_color = colormapPaletteColor(floor(stof(getplayerkeyvalue(current_player, "colors")) / 16), 0); \
+                       } else if (panel_bg_color_str == "pants") {                                                             \
+                               panel_bg_color = colormapPaletteColor(stof(getplayerkeyvalue(current_player, "colors")) % 16, 1); \
+                       } else {                                                                                                \
+                               panel_bg_color = stov(panel_bg_color_str);                                                          \
+                       }                                                                                                       \
+               }                                                                                                           \
+       }                                                                                                               \
+} while(0)
+
+// Get value for panel_bg_color_team: if "" fetch default, else use panel_bg_color_team_str
+#define HUD_Panel_GetColorTeam() do {                                                                               \
+       if (panel_bg_color_team_str == "") {                                                     &nbs