The PanelHud. Now in Xonotic git.
authorFruitieX <rasse@rasse-lappy.localdomain>
Sun, 25 Apr 2010 07:57:43 +0000 (10:57 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sun, 2 May 2010 11:40:19 +0000 (14:40 +0300)
15 files changed:
defaultXonotic.cfg
gfx/hud/border.tga [new file with mode: 0644]
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/hud.qc [new file with mode: 0644]
qcsrc/client/hud.qh [new file with mode: 0644]
qcsrc/client/main.qh
qcsrc/client/mapvoting.qc
qcsrc/client/progs.src
qcsrc/client/sbar.qc [deleted file]
qcsrc/client/scoreboard.qc [new file with mode: 0644]
qcsrc/client/teamradar.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/constants.qh
qcsrc/menu/menu.qh

index 0c44f8e..a841a46 100644 (file)
@@ -1314,13 +1314,85 @@ con_chatwidth 0.6
 con_notifysize 10
 con_notifyalign 0
 
+// hud variables
+set _hud_configure 0
+seta hud_color "0 0.7 0.8" "color of the hud"
+seta hud_accuracy_yellow 40 "percentage at which the accuracy color is yellow"
+seta hud_alpha_bg 0.8 "alpha of the background"
+seta hud_alpha_fg 1 "alpha of the foreground"
+
+seta hud_weaponicons 1 "enable/disable this panel"
+seta hud_weaponicons_pos "210 -60" "position of this panel"
+seta hud_weaponicons_height 15 "height of this panel"
+seta hud_weaponicons_bg 1 "enable/disable the background of this panel"
+seta hud_weaponicons_marigin 10 "size of marigin from the background edges""
+seta hud_weaponicons_number 1 "show number of weapon"
+seta hud_weaponicons_accuracybar_height 3 "height of accuracy bar"
+seta hud_weaponicons_color "" "optional R G B vector of the weaponicons background color, otherwise use hud default"
+
+seta hud_inventory 1 "enable/disable this panel"
+seta hud_inventory_pos "0 -90" "position of this panel"
+seta hud_inventory_size "240 90" "size of this panel"
+seta hud_inventory_bg 1 "enable/disable the background of this panel"
+seta hud_inventory_marigin 30 "size of marigin from the background edges"
+seta hud_inventory_color "" "optional R G B vector of the inventory background color, otherwise use hud default"
+
+seta hud_powerups 1 "enable/disable this panel"
+seta hud_powerups_pos "0 -90" "position of this panel"
+seta hud_powerups_size "240 90" "size of this panel"
+seta hud_powerups_bg 1 "enable/disable the background of this panel"
+seta hud_powerups_marigin 30 "size of marigin from the background edges"
+seta hud_powerups_color "" "optional R G B vector of the inventory background color, otherwise use hud default"
+
+seta hud_healtharmor 1 "enable/disable this panel"
+seta hud_healtharmor_pos "210 -37.5" "position of this panel"
+seta hud_healtharmor_size "200 37.5" "size of this panel"
+seta hud_healtharmor_bg 1 "enable/disable the background of this panel"
+seta hud_healtharmor_marigin 30 "size of marigin from the background edges"
+seta hud_healtharmor_color "" "optional R G B vector of the inventory background color, otherwise use hud default"
+
+seta hud_notify 1 "enable/disable this panel"
+seta hud_notify_pos "-300 -37.5" "position of this base of the panel"
+seta hud_notify_size "200 37.5" "size of this panel with all notifications on"
+seta hud_notify_bg 1 "enable/disable the background of this panel"
+seta hud_notify_marigin 30 "size of marigin from the background edges"
+seta hud_notify_color "" "optional R G B vector of the inventory background color, otherwise use hud default"
+
+seta hud_timer 1 "enable/disable this panel"
+seta hud_timer_pos "-300 -37.5" "position of this base of the panel"
+seta hud_timer_size "200 37.5" "size of this panel"
+seta hud_timer_bg 1 "enable/disable the background of this panel"
+seta hud_timer_marigin 30 "size of marigin from the background edges"
+seta hud_timer_color "" "optional R G B vector of the inventory background color, otherwise use hud default"
+
+seta hud_radar 1 "enable/disable this panel"
+seta hud_radar_pos "-300 -37.5" "position of this base of the panel"
+seta hud_radar_size "200 37.5" "size of this panel"
+seta hud_radar_bg 1 "enable/disable the background of this panel"
+seta hud_radar_marigin 30 "size of marigin from the background edges"
+seta hud_radar_color "" "optional R G B vector of the inventory background color, otherwise use hud default"
+
+seta hud_score 1 "enable/disable this panel"
+seta hud_score_pos "-300 -37.5" "position of this base of the panel"
+seta hud_score_size "200 37.5" "size of this panel"
+seta hud_score_bg 1 "enable/disable the background of this panel"
+seta hud_score_marigin 30 "size of marigin from the background edges"
+seta hud_score_color "" "optional R G B vector of the inventory background color, otherwise use hud default"
+
+seta hud_racetimer 1 "enable/disable this panel"
+seta hud_racetimer_pos "-300 -37.5" "position of this base of the panel"
+seta hud_racetimer_size "200 37.5" "size of this panel"
+seta hud_racetimer_bg 0 "enable/disable the background of this panel"
+seta hud_racetimer_marigin 30 "size of marigin from the background edges"
+seta hud_racetimer_color "" "optional R G B vector of the inventory background color, otherwise use hud default"
+
+// these should now be deprecated.
 sbar_info_pos 50
 seta sbar_alpha_bg 0.8 "alpha value of the HUD background"
 seta sbar_alpha_fg 1 "alpha value of the HUD foreground items"
 seta sbar_border_thickness 1 "scoreboard border thickness"
 seta sbar_accuracy_border_thickness 1 "accuracy stats border thickness"
 seta sbar_accuracy_doublerows 0 "use two rows instead of one"
-seta sbar_accuracy_yellow 40 "percentage at which the accuracy color is yellow"
 seta sbar_accuracy 1 "0 = no weapon accuracy stats panel on scoreboard"
 seta sbar_accuracy_hud 1 "0 = no weapon accuracy bar on the weapon icons"
 seta sbar_color_bg_r 0 "red color component of the HUD background"
diff --git a/gfx/hud/border.tga b/gfx/hud/border.tga
new file mode 100644 (file)
index 0000000..6535f36
Binary files /dev/null and b/gfx/hud/border.tga differ
index 985bcc7..90563de 100644 (file)
@@ -615,11 +615,16 @@ void GameCommand(string msg)
 // bInputType = 0 is key pressed, 1 is key released, 2 is mouse input.
 // In the case of keyboard input, nPrimary is the ascii code, and nSecondary is 0.
 // In the case of mouse input, nPrimary is xdelta, nSecondary is ydelta.
+float hudconf_active;
 float CSQC_InputEvent(float bInputType, float nPrimary, float nSecondary)
 {
        local float bSkipKey;
        bSkipKey = false;
 
+       if(hudconf_active)
+               if (HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary))
+                       return true;
+
        if (MapVote_InputEvent(bInputType, nPrimary, nSecondary))
                return true;
 
index 9bb7661..e05fbce 100644 (file)
@@ -378,6 +378,10 @@ void CSQC_UpdateView(float w, float h)
                view_set = 1;
        }
 
+       hudconf_active = cvar("_hud_configure");
+       if(hudconf_active)
+               R_SetView(VF_ANGLES, self.angles); // TODO: this should freeze the view as it is, not change it to '0 0 0' or whatever it currently does...
+
        vid_width = w;
        vid_height = h;
 
@@ -443,10 +447,10 @@ void CSQC_UpdateView(float w, float h)
                }
        }
 
-       sbar_alpha_fg = cvar("sbar_alpha_fg" ) * (1 - cvar("_menu_alpha"));
-       sbar_currentammo = cvar("sbar_showcurrentammo");
-       sbar_hudselector = cvar("sbar_hudselector");
-       sbar_accuracy_hud = cvar_or("sbar_accuracy_hud", 1);
+       hud_alpha_fg = cvar_or("hud_alpha_fg", 1) * (1 - cvar("_menu_alpha"));
+       sbar_currentammo = cvar("hud_showcurrentammo");
+       hud_hudselector = cvar("hud_hudselector");
+       hud_accuracy_hud = cvar_or("hud_accuracy_hud", 1);
        ColorTranslateMode = cvar("cl_stripcolorcodes");
        activeweapon = getstati(STAT_SWITCHWEAPON);
        f = cvar("teamplay");
@@ -579,15 +583,15 @@ void CSQC_UpdateView(float w, float h)
        if(cvar("r_letterbox") == 0) {
                if (cvar("cl_showpressedkeys")) { // draw pressed keys when spectating and playing
                        if(spectatee_status > 0 || cvar("cl_showpressedkeys") >= 2)
-                               Sbar_DrawPressedKeys();
+                               HUD_DrawPressedKeys();
                }
 
                if (cvar("cl_showspeed"))
-                       Sbar_ShowSpeed();
+                       HUD_ShowSpeed();
                if (cvar("cl_showacceleration"))
-                       Sbar_ShowAcceleration();
+                       HUD_ShowAcceleration();
 
-               Sbar_DrawCenterPrint(); // draw centerprint messages even if viewsize >= 120
+               HUD_DrawCenterPrint(); // draw centerprint messages even if viewsize >= 120
        }
 
        float hud;
@@ -607,7 +611,7 @@ void CSQC_UpdateView(float w, float h)
                                CSQC_common_hud();
 
                // crosshair goes VERY LAST
-               if(!scoreboard_active && !ons_showmap && !camera_active) {
+               if(!scoreboard_active && !ons_showmap && !camera_active && !hudconf_active) {
                        // TrueAim check
                        float shottype;
                        float bullets, ring_scale;
@@ -843,19 +847,19 @@ void CSQC_UpdateView(float w, float h)
                cvar_set("vid_conheight", h0);
        }
 
+       if(hudconf_active)
+               HUD_Panel_Mouse();
        // be safe against triggerbots until everyone has the fixed engine
        // this call is meant to overwrite the trace globals by something
        // unsuspicious
        traceline('0 0 0', '0 0 0', MOVE_WORLDONLY, world);
 }
 
-void Sbar_Draw();
 #define spider_h "gfx/vehicles/hud_bg.tga"
 #define spider_b "gfx/vehicles/sbot.tga"
 #define spider_r "gfx/vehicles/sbot_rpods.tga"
 #define spider_g "gfx/vehicles/sbot_mguns.tga"
 #define spider_s "gfx/vehicles/shiled.tga"
-
 #define spider_a1 "gfx/hud/sb_rocket.tga"
 #define spider_a2 "gfx/sb_bullets.tga"
 
@@ -961,7 +965,7 @@ void CSQC_SPIDER_HUD()
        if (sb_showscores)
        {
                Sbar_DrawScoreboard();
-               Sbar_DrawCenterPrint();
+               HUD_DrawCenterPrint();
        }
 
 }
@@ -1031,7 +1035,7 @@ void CSQC_RAPTOR_HUD()
        if (sb_showscores)
        {
                Sbar_DrawScoreboard();
-               Sbar_DrawCenterPrint();
+               HUD_DrawCenterPrint();
        }
 
 }
@@ -1157,7 +1161,7 @@ void CSQC_common_hud(void)
        switch(hud)
        {
                case HUD_NORMAL:
-                       Sbar_Draw();
+                       HUD_Main();
                        break;
 
                case HUD_SPIDERBOT:
diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
new file mode 100644 (file)
index 0000000..bd1c83b
--- /dev/null
@@ -0,0 +1,2611 @@
+/*
+==================
+Misc HUD functions
+==================
+*/
+
+// a border picture is a texture containing nine parts:
+//   1/4 width: left part
+//   1/2 width: middle part (stretched)
+//   1/4 width: right part
+// divided into
+//   1/4 height: top part
+//   1/2 height: middle part (stretched)
+//   1/4 height: bottom part
+void draw_BorderPicture(vector theOrigin, string pic, vector theSize, vector theColor, float theAlpha, vector theBorderSize)
+{
+       vector dX, dY;
+       vector width, height;
+       vector bW, bH;
+       //pic = draw_UseSkinFor(pic);
+       width = eX * theSize_x;
+       height = eY * theSize_y;
+       if(theSize_x <= theBorderSize_x * 2)
+       {
+               // not wide enough... draw just left and right then
+               bW = eX * (0.25 * theSize_x / (theBorderSize_x * 2));
+               if(theSize_y <= theBorderSize_y * 2)
+               {
+                       // not high enough... draw just corners
+                       bH = eY * (0.25 * theSize_y / (theBorderSize_y * 2));
+                       drawsubpic(theOrigin,                 width * 0.5 + height * 0.5, pic, '0 0 0',           bW + bH, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + width   * 0.5, width * 0.5 + height * 0.5, pic, eX - bW,           bW + bH, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + height  * 0.5, width * 0.5 + height * 0.5, pic, eY - bH,           bW + bH, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + theSize * 0.5, width * 0.5 + height * 0.5, pic, eX + eY - bW - bH, bW + bH, theColor, theAlpha, 0);
+               }
+               else
+               {
+                       dY = theBorderSize_x * eY;
+                       drawsubpic(theOrigin,                             width * 0.5          +     dY, pic, '0 0    0',           '0 0.25 0' + bW, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + width * 0.5,               width * 0.5          +     dY, pic, '0 0    0' + eX - bW, '0 0.25 0' + bW, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin                        + dY, width * 0.5 + height - 2 * dY, pic, '0 0.25 0',           '0 0.5  0' + bW, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + width * 0.5          + dY, width * 0.5 + height - 2 * dY, pic, '0 0.25 0' + eX - bW, '0 0.5  0' + bW, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin               + height - dY, width * 0.5          +     dY, pic, '0 0.75 0',           '0 0.25 0' + bW, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + width * 0.5 + height - dY, width * 0.5          +     dY, pic, '0 0.75 0' + eX - bW, '0 0.25 0' + bW, theColor, theAlpha, 0);
+               }
+       }
+       else
+       {
+               if(theSize_y <= theBorderSize_y * 2)
+               {
+                       // not high enough... draw just top and bottom then
+                       bH = eY * (0.25 * theSize_y / (theBorderSize_y * 2));
+                       dX = theBorderSize_x * eX;
+                       drawsubpic(theOrigin,                                         dX + height * 0.5, pic, '0    0 0',           '0.25 0 0' + bH, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + dX,                        width - 2 * dX + height * 0.5, pic, '0.25 0 0',           '0.5  0 0' + bH, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + width - dX,                            dX + height * 0.5, pic, '0.75 0 0',           '0.25 0 0' + bH, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin              + height * 0.5,             dX + height * 0.5, pic, '0    0 0' + eY - bH, '0.25 0 0' + bH, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + dX         + height * 0.5, width - 2 * dX + height * 0.5, pic, '0.25 0 0' + eY - bH, '0.5  0 0' + bH, theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + width - dX + height * 0.5,             dX + height * 0.5, pic, '0.75 0 0' + eY - bH, '0.25 0 0' + bH, theColor, theAlpha, 0);
+               }
+               else
+               {
+                       dX = theBorderSize_x * eX;
+                       dY = theBorderSize_x * eY;
+                       drawsubpic(theOrigin,                                        dX          +     dY, pic, '0    0    0', '0.25 0.25 0', theColor, theAlpha, 0);
+                       drawsubpic(theOrigin                  + dX,      width - 2 * dX          +     dY, pic, '0.25 0    0', '0.5  0.25 0', theColor, theAlpha, 0);
+                       drawsubpic(theOrigin          + width - dX,                  dX          +     dY, pic, '0.75 0    0', '0.25 0.25 0', theColor, theAlpha, 0);
+                       drawsubpic(theOrigin          + dY,                          dX + height - 2 * dY, pic, '0    0.25 0', '0.25 0.5  0', theColor, theAlpha, 0);
+                       drawsubpic(theOrigin          + dY         + dX, width - 2 * dX + height - 2 * dY, pic, '0.25 0.25 0', '0.5  0.5  0', theColor, theAlpha, 0);
+                       drawsubpic(theOrigin          + dY + width - dX,             dX + height - 2 * dY, pic, '0.75 0.25 0', '0.25 0.5  0', theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + height - dY,                          dX          +     dY, pic, '0    0.75 0', '0.25 0.25 0', theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + height - dY         + dX, width - 2 * dX          +     dY, pic, '0.25 0.75 0', '0.5  0.25 0', theColor, theAlpha, 0);
+                       drawsubpic(theOrigin + height - dY + width - dX,             dX          +     dY, pic, '0.75 0.75 0', '0.25 0.25 0', theColor, theAlpha, 0);
+               }
+       }
+}
+
+// return HUD background color
+vector HUD_GetBgColor()
+{
+       vector color;
+       if (teamplay)
+               GetTeamRGB(myteam) * hud_color_bg_team;
+       else {
+               // allow custom HUD colors in non-teamgames
+               color_x = cvar("hud_color_bg_r");
+               color_y = cvar("hud_color_bg_g");
+               color_z = cvar("hud_color_bg_b");
+       }
+       return color;
+}
+
+// return accuracy text color
+vector HUD_AccuracyColor(float accuracy)
+{
+       vector rgb;
+       float yellow_accuracy = cvar("hud_accuracy_yellow"); // value at which this function returns yellow
+       if(accuracy >= 100) {
+               rgb_x = 0;
+               rgb_y = 1;
+       }
+       else if(accuracy > yellow_accuracy) {
+               rgb_x = 1 - (accuracy-yellow_accuracy)/(100-yellow_accuracy); // red value between 1 -> 0
+               rgb_y = 1;
+       }
+       else {
+               rgb_x = 1;
+               rgb_y = accuracy/yellow_accuracy; // green value between 0 -> 1
+       }
+       rgb_z = 0;
+       return rgb;
+}
+
+// draw number in the XSCALE font
+void HUD_DrawXNum (vector pos, float num, float digits, float showsign, float lettersize, vector rgb, float highlighted, float stroke, float alpha, float dflags)
+{
+       float l, i;
+       string str, tmp, l_length;
+       float minus, plus;
+       vector vsize, num_color;
+
+       vsize_x = vsize_y = lettersize;
+       vsize_z = 0;
+
+       // showsign 1: always prefix with minus sign (useful in race distribution display)
+       // showsign 2: always prefix with plus sign (useful in race distribution display)
+       // showsign 3: prefix with minus sign if negative, plus sign if positive (useful in score distribution display)
+
+       if((showsign == 2 && num >= 0) || (num > 0 && showsign == 3))
+       {
+               plus = true;
+               pos_x -= lettersize;
+       } else
+               plus = false;
+
+       if(num < 0 || (num < 0 && showsign == 3) || (showsign == 1 && num <= 0))
+       {
+               minus = true;
+               num = -num;
+               pos_x -= lettersize;
+       } else
+               minus = false;
+
+       if(digits < 0)
+       {
+               tmp = ftos(num);
+               digits = -digits;
+               str = strcat(substring("0000000000", 0, digits - strlen(tmp)), tmp);
+       } else
+               str = ftos(num);
+
+       l = strlen(str);
+       l_length = ftos(l);
+
+       if(l > digits)
+       {
+               str = substring(str, l-digits, 999);
+               l = strlen(str);
+       } else if(l < digits)
+               pos_x += (digits-l) * lettersize;
+
+       if (highlighted == 1) {
+               vector hl_size;
+               hl_size_x = vsize_x * l + vsize_x * 0.2;
+               hl_size_y = vsize_y * 1.1;
+               hl_size_z = 0;
+               if(minus)
+                       hl_size_x = hl_size_x + vsize_x;
+
+               vector hl_pos;
+               hl_pos_x = pos_x - lettersize/10;
+               hl_pos_y = pos_y - lettersize/20;
+               hl_pos_z = 0;
+
+               drawpic(hl_pos, strcat("gfx/hud/sb_highlight_", l_length), hl_size, '1 1 1', alpha, dflags);
+       }
+
+       if (stroke == 1)
+               num_color = '1 1 1';
+       else
+               num_color = rgb;
+
+       if(minus)
+       {
+               if (stroke == 1)
+                       drawpic(pos, "gfx/hud/num_minus_stroke", vsize, rgb, alpha, dflags);
+               drawpic(pos, "gfx/hud/num_minus", vsize, num_color, alpha, dflags);
+               pos_x += lettersize;
+       } else if(plus)
+       {
+               if (stroke == 1)
+                       drawpic(pos, "gfx/hud/num_plus_stroke", vsize, rgb, alpha, dflags);
+               drawpic(pos, "gfx/hud/num_plus", vsize, num_color, alpha, dflags);
+               pos_x += lettersize;
+       }
+
+       for(i = 0; i < l; ++i)
+       {
+               tmp = substring(str, i, 1);
+               if (stroke == 1)
+                       drawpic(pos, strcat("gfx/hud/num_", tmp, "_stroke"), vsize, rgb, alpha, dflags);
+               drawpic(pos, strcat("gfx/hud/num_", tmp), vsize, num_color, alpha, dflags);
+               pos_x += lettersize;
+       }
+}
+
+// color the number differently based on how big it is (used in the health/armor panel)
+void HUD_DrawXNum_Colored (vector pos, float x, float lettersize, float alpha)
+{
+       vector color;
+       if(x > 200) {
+               color_x = 0;
+               color_y = 1;
+               color_z = 0;
+       }
+       else if(x > 150) {
+               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 > 100) {
+               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 > 50) {
+               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 > 20) {
+               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;
+       }
+       HUD_DrawXNum(pos, x, 3, 0, lettersize, color, 0, 0, alpha, DRAWFLAG_NORMAL);
+}
+
+float stringwidth_colors(string s, vector theSize)
+{
+       return stringwidth(s, TRUE, theSize);
+}
+
+float stringwidth_nocolors(string s, vector theSize)
+{
+       return stringwidth(s, FALSE, theSize);
+}
+
+#define CENTERPRINT_MAX_LINES 30
+string centerprint_messages[CENTERPRINT_MAX_LINES];
+float centerprint_width[CENTERPRINT_MAX_LINES];
+vector centerprint_start;
+float centerprint_expire;
+float centerprint_num;
+float centerprint_offset_hint;
+vector centerprint_fontsize;
+
+void centerprint(string strMessage)
+{
+       float i, j, n, hcount;
+       string s;
+
+       centerprint_fontsize = Sbar_GetFontsize("scr_centersize");
+
+       centerprint_expire = min(centerprint_expire, time); // if any of the returns happens, this message will fade out
+
+       if(cvar("scr_centertime") <= 0)
+               return;
+
+       if(strMessage == "")
+               return;
+
+       // strip trailing newlines
+       j = strlen(strMessage) - 1;
+       while(substring(strMessage, j, 1) == "\n" && j >= 0)
+               j = j - 1;
+       strMessage = substring(strMessage, 0, j + 1);
+
+       if(strMessage == "")
+               return;
+
+       // strip leading newlines and remember them, they are a hint that the message should be lower on the screen
+       j = 0;
+       while(substring(strMessage, j, 1) == "\n" && j < strlen(strMessage))
+               j = j + 1;
+       strMessage = substring(strMessage, j, strlen(strMessage) - j);
+       centerprint_offset_hint = j;
+
+       if(strMessage == "")
+               return;
+
+       // if we get here, we have a message. Initialize its height.
+       centerprint_num = 0;
+
+       n = tokenizebyseparator(strMessage, "\n");
+       i = hcount = 0;
+       for(j = 0; j < n; ++j)
+       {
+               getWrappedLine_remaining = argv(j);
+               while(getWrappedLine_remaining)
+               {
+                       s = getWrappedLine(vid_conwidth * 0.75, centerprint_fontsize, stringwidth_colors);
+                       if(centerprint_messages[i])
+                               strunzone(centerprint_messages[i]);
+                       centerprint_messages[i] = strzone(s);
+                       centerprint_width[i] = stringwidth(s, TRUE, centerprint_fontsize);
+                       ++i;
+
+                       // half height for empty lines looks better
+                       if(s == "")
+                               hcount += 0.5;
+                       else
+                               hcount += 1;
+
+                       if(i >= CENTERPRINT_MAX_LINES)
+                               break;
+               }
+       }
+
+       float h, havail;
+       h = centerprint_fontsize_y*hcount;
+
+       havail = vid_conheight;
+       if(cvar("con_chatpos") < 0)
+               havail -= (-cvar("con_chatpos") + cvar("con_chat")) * cvar("con_chatsize"); // avoid overlapping chat
+       if(havail > vid_conheight - 70)
+               havail = vid_conheight - 70; // avoid overlapping HUD
+
+       centerprint_start_x = 0;
+
+#if 0
+       float forbiddenmin, forbiddenmax, allowedmin, allowedmax, preferred;
+
+       // here, the centerprint would cover the crosshair. REALLY BAD.
+       forbiddenmin = vid_conheight * 0.5 - h - 16;
+       forbiddenmax = vid_conheight * 0.5 + 16;
+
+       allowedmin = scoreboard_bottom;
+       allowedmax = havail - h;
+       preferred = (havail - h)/2;
+
+
+       // possible orderings (total: 4! / 4 = 6)
+       //  allowedmin allowedmax forbiddenmin forbiddenmax
+       //  forbiddenmin forbiddenmax allowedmin allowedmax
+       if(allowedmax < forbiddenmin || allowedmin > forbiddenmax)
+       {
+               // forbidden doesn't matter in this case
+               centerprint_start_y = bound(allowedmin, preferred, allowedmax);
+       }
+       //  allowedmin forbiddenmin allowedmax forbiddenmax
+       else if(allowedmin < forbiddenmin && allowedmax < forbiddenmax)
+       {
+               centerprint_start_y = bound(allowedmin, preferred, forbiddenmin);
+       }
+       //  allowedmin forbiddenmin forbiddenmax allowedmax
+       else if(allowedmin < forbiddenmin)
+       {
+               // make sure the forbidden zone is not covered
+               if(preferred > (forbiddenmin + forbiddenmax) * 0.5)
+                       centerprint_start_y = bound(allowedmin, preferred, forbiddenmin);
+               else
+                       centerprint_start_y = bound(forbiddenmax, preferred, allowedmin);
+       }
+       //  forbiddenmin allowedmin allowedmax forbiddenmax
+       else if(allowedmax < forbiddenmax)
+       {
+               // it's better to leave the allowed zone (overlap with scoreboard) than
+               // to cover the forbidden zone (crosshair)
+               if(preferred > (forbiddenmin + forbiddenmax) * 0.5)
+                       centerprint_start_y = forbiddenmax;
+               else
+                       centerprint_start_y = forbiddenmin;
+       }
+       //  forbiddenmin allowedmin forbiddenmax allowedmax
+       else
+       {
+               centerprint_start_y = bound(forbiddenmax, preferred, allowedmax);
+       }
+#else
+       centerprint_start_y =
+               min(
+                       max(
+                               max(scoreboard_bottom, vid_conheight * 0.5 + 16),
+                               (havail - h)/2
+                       ),
+                       havail - h
+               );
+#endif
+
+       centerprint_num = i;
+       centerprint_expire = time + cvar("scr_centertime");
+}
+
+void HUD_DrawCenterPrint (void)
+{
+       float i;
+       vector pos;
+       string ts;
+       float a;
+
+       //if(time > centerprint_expire)
+       //      return;
+
+       //a = bound(0, 1 - 2 * (time - centerprint_expire), 1);
+       a = bound(0, 1 - 4 * (time - centerprint_expire), 1);
+       //sz = 1.2 / (a + 0.2);
+
+       if(a <= 0)
+               return;
+
+       pos = centerprint_start;
+       for (i=0; i<centerprint_num; i = i + 1)
+       {
+               pos_x = (vid_conwidth - centerprint_width[i]) * 0.5;
+               ts = centerprint_messages[i];
+               if (ts != "")
+               {
+                       dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
+                       drawcolorcodedstring(pos, ts, centerprint_fontsize, a, DRAWFLAG_NORMAL);
+                       //  - '0 0.5 0' * (sz - 1) * centerprint_fontsize_x - '0.5 0 0' * (sz - 1) * centerprint_width[i] * centerprint_fontsize_y, centerprint_fontsize * sz
+                       pos_y = pos_y + centerprint_fontsize_y;
+               }
+               else
+                       // half height for empty lines looks better
+                       pos_y = pos_y + centerprint_fontsize_y * 0.5;
+       }
+}
+
+void drawstringright(vector position, string text, vector scale, vector rgb, float alpha, float flag)
+{
+       position_x -= 2 / 3 * strlen(text) * scale_x;
+       drawstring(position, text, scale, rgb, alpha, flag);
+}
+
+void drawstringcenter(vector position, string text, vector scale, vector rgb, float alpha, float flag)
+{
+       position_x = 0.5 * (vid_conwidth - 0.6025 * strlen(text) * scale_x);
+       drawstring(position, text, scale, rgb, alpha, flag);
+}
+
+// return the string of the given race place
+string race_PlaceName(float pos) {
+       if(pos == 1)
+               return "1st";
+       else if(pos == 2)
+               return "2nd";
+       else if(pos == 3)
+               return "3rd";
+       else
+               return strcat(ftos(pos), "th");
+}
+
+// return the string of the onscreen race timer
+string MakeRaceString(float cp, float mytime, float histime, float lapdelta, string hisname)
+{
+       string col;
+       string timestr;
+       string cpname;
+       string lapstr;
+       lapstr = "";
+
+       if(histime == 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 = strcat(" (-", ftos(lapdelta), "L)");
+                       col = "^2";
+               }
+               else if(lapdelta < 0)
+               {
+                       lapstr = strcat(" (+", ftos(-lapdelta), "L)");
+                       col = "^1";
+               }
+       }
+       else if(histime > 0) // anticipation
+       {
+               if(mytime >= histime)
+                       timestr = strcat("+", ftos_decimals(mytime - histime, TIME_DECIMALS));
+               else
+                       timestr = TIME_ENCODED_TOSTRING(TIME_ENCODE(histime));
+               col = "^3";
+       }
+       else
+               col = "^7";
+
+       if(cp == 254)
+               cpname = "Start line";
+       else if(cp == 255)
+               cpname = "Finish line";
+       else if(cp)
+               cpname = strcat("Intermediate ", ftos(cp));
+       else
+               cpname = "Finish line";
+
+       if(histime < 0)
+               return strcat(col, cpname);
+       else if(hisname == "")
+               return strcat(col, cpname, " (", timestr, ")");
+       else
+               return strcat(col, cpname, " (", timestr, " ", strcat(hisname, col, lapstr), ")");
+}
+
+// Check if the given name already exist in race rankings? In that case, where? (otherwise return 0)
+float race_CheckName(string net_name) {
+       float i;
+       for (i=RANKINGS_CNT-1;i>=0;--i)
+               if(grecordholder[i] == net_name)
+                       return i+1;
+       return 0;
+}
+
+/*
+==================
+HUD panels
+==================
+*/
+
+string HUD_Panel_GetName(float id)
+{
+       switch(id) {
+               case 0: return "weaponicons"; break;
+               case 1: return "inventory"; break;
+               case 2: return "powerups"; break;
+               case 3: return "healtharmor"; break;
+               case 4: return "notify"; break;
+               case 5: return "timer"; break;
+               case 6: return "radar"; break;
+               case 7: return "score"; break;
+               case 8: return "racetimer"; break;
+               default: return "";
+       }
+}
+
+// return active status of panel
+float HUD_Panel_CheckActive(float id)
+{
+       if (cvar_or(strcat("hud_", HUD_Panel_GetName(id)), 1))
+               return 1;
+       return 0;
+}
+
+// return size of given panel
+vector HUD_Panel_GetSize(float id)
+{
+       return stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_size")));
+}
+
+// return pos of given panel
+vector HUD_Panel_GetPos(float id)
+{
+       vector pos;
+       pos = stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_pos")));
+
+       if (pos_x < 0)
+               pos_x = vid_conwidth + pos_x;
+       if (pos_y < 0)
+               pos_y = vid_conheight + pos_y;
+       return pos;
+}
+
+float HUD_Panel_GetMarigin(float id)
+{
+       return bound(1, MARIGIN_MULTIPLIER * cvar_or(strcat("hud_", HUD_Panel_GetName(id), "_marigin"), 30), 200);
+}
+
+vector HUD_Panel_GetColor(float id)
+{
+       if(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_color")) != "")
+               return stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_color")));
+       else
+               return stov(cvar_string("hud_color"));
+}
+
+float HUD_Panel_GetBgActive(float id)
+{
+       if(cvar("_hud_configure"))
+               return 1;
+
+       return cvar_or(strcat("hud_", HUD_Panel_GetName(id), "_bg"), 1);
+}
+
+// check if resize will result in panel being moved into another panel. If so, return snapped vector, otherwise return the given vector
+vector HUD_Panel_CheckResize(float id, vector myPos, vector mySize)
+{
+       float i;
+
+       vector myTarget;
+       myTarget = mySize;
+
+       myPos = myPos - '1 1 0' * HUD_Panel_GetMarigin(id);
+       mySize = mySize + '1 1 0' * HUD_Panel_GetMarigin(id);
+
+       vector targPos;
+       vector targSize;
+       vector myCenter;
+       vector targCenter;
+
+       for (i = 0; i < panel_cnt; ++i) {
+               if(i == id || !HUD_Panel_CheckActive(i))
+                       continue;
+
+               targPos = HUD_Panel_GetPos(i);
+               targSize = HUD_Panel_GetSize(i);
+
+               if(myPos_y + mySize_y < targPos_y)
+                       continue;
+               if(myPos_y > targPos_y + targSize_y)
+                       continue;
+
+               if(myPos_x + mySize_x < targPos_x)
+                       continue;
+               if(myPos_x > targPos_x + targSize_x)
+                       continue;
+
+               myCenter_x = myPos_x + 0.5 * mySize_x;
+               myCenter_y = myPos_y + 0.5 * mySize_y;
+
+               targCenter_x = targPos_x + 0.5 * targSize_x;
+               targCenter_y = targPos_y + 0.5 * targSize_y;
+
+               float k, y;
+               k = (targCenter_y - targPos_y) / (targPos_x + targSize_x - targCenter_x);
+               y = k * (targCenter_x - myCenter_x) + targCenter_y;
+               if(y > myCenter_y)
+               {
+                       y = k * (myCenter_x - targCenter_x) + targCenter_y;
+                       if(y < myCenter_y)
+                       {
+                               myTarget_x = targPos_x - myPos_x;
+                       }
+                       else
+                       {
+                               myTarget_y = targPos_y - myPos_y;
+                       }
+               }
+               else
+               {
+                       y = k * (myCenter_x - targCenter_x) + targCenter_y;
+                       if(y < myCenter_y)
+                       {
+                               myTarget_y = targPos_y + targSize_y;
+                       }
+                       else
+                       {
+                               myTarget_x = targPos_x + targSize_x;
+                       }
+               }
+       }
+
+       return myTarget;
+}
+
+// TODO: checkResize
+float HUD_Panel_SetSize(float id, vector mySize)
+{
+       float didntresize;
+
+       vector oldSize;
+       oldSize = stov(cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_size")));
+
+       mySize_x = bound(0.025 * vid_conwidth, mySize_x, vid_conwidth);
+       mySize_y = bound(0.025 * vid_conheight, mySize_y, vid_conheight);
+
+       mySize = HUD_Panel_CheckResize(id, HUD_Panel_GetPos(id), mySize);
+
+       mySize_x = bound(0.025 * vid_conwidth, mySize_x, vid_conwidth);
+       mySize_y = bound(0.025 * vid_conheight, mySize_y, vid_conheight);
+
+       // this is to check if (and how) SetPos should be called
+       if(mySize_x == oldSize_x && mySize_y == oldSize_y)
+               didntresize = 3; // didnt resize either
+       else if(mySize_x == oldSize_x && mySize_y != oldSize_y)
+               didntresize = 2; // resized Y
+       else if(mySize_y == oldSize_y && mySize_x != oldSize_x)
+               didntresize = 1; // resized X
+
+       string s;
+       s = strcat(ftos(mySize_x), " ", ftos(mySize_y));
+       cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_size"), s);
+       return didntresize;
+}
+
+// check if move will result in panel being moved into another panel. If so, return snapped vector, otherwise return the given vector
+vector HUD_Panel_CheckMove(float id, vector myPos, vector mySize)
+{
+       float i;
+
+       vector myTarget;
+       myTarget = myPos;
+
+       myPos = myPos - '1 1 ' * HUD_Panel_GetMarigin(id);
+       mySize = mySize + '1 1 0' * HUD_Panel_GetMarigin(id);
+
+       vector targPos;
+       vector targSize;
+       vector myCenter;
+       vector targCenter;
+
+       for (i = 0; i < panel_cnt; ++i) {
+               if(i == id || !HUD_Panel_CheckActive(i))
+                       continue;
+
+               targPos = HUD_Panel_GetPos(i);
+               targSize = HUD_Panel_GetSize(i);
+
+               if(myPos_y + mySize_y < targPos_y)
+                       continue;
+               if(myPos_y > targPos_y + targSize_y)
+                       continue;
+
+               if(myPos_x + mySize_x < targPos_x)
+                       continue;
+               if(myPos_x > targPos_x + targSize_x)
+                       continue;
+
+               myCenter_x = myPos_x + 0.5 * mySize_x;
+               myCenter_y = myPos_y + 0.5 * mySize_y;
+
+               targCenter_x = targPos_x + 0.5 * targSize_x;
+               targCenter_y = targPos_y + 0.5 * targSize_y;
+
+               float k, y;
+               k = (targCenter_y - targPos_y) / (targPos_x + targSize_x - targCenter_x);
+               y = k * (targCenter_x - myCenter_x) + targCenter_y;
+               if(y > myCenter_y)
+               {
+                       y = k * (myCenter_x - targCenter_x) + targCenter_y;
+                       if(y < myCenter_y)
+                       {
+                               myTarget_x = targPos_x - mySize_x;
+                       }
+                       else
+                       {
+                               myTarget_y = targPos_y - mySize_y ;
+                       }
+               }
+               else
+               {
+                       y = k * (myCenter_x - targCenter_x) + targCenter_y;
+                       if(y < myCenter_y)
+                       {
+                               myTarget_y = targPos_y + targSize_y + '1 0 0' * HUD_Panel_GetMarigin(id);
+                       }
+                       else
+                       {
+                               myTarget_x = targPos_x + targSize_x + '1 0 0' * HUD_Panel_GetMarigin(id);
+                       }
+               }
+       }
+
+       return myTarget;
+}
+
+void HUD_Panel_SetPos(float id, vector pos, float didntresize)
+{
+       vector oldPos;
+       oldPos = HUD_Panel_GetPos(id);
+       if(didntresize == 2)
+               pos_x = oldPos_x;
+       else if(didntresize == 1)
+               pos_y = oldPos_y;
+       else if(didntresize == 3)
+               return;
+
+       vector mySize;
+       mySize = HUD_Panel_GetSize(id);
+
+       pos = HUD_Panel_CheckMove(id, pos, mySize);
+
+       pos_x = bound(0, pos_x, vid_conwidth - mySize_x);
+       pos_y = bound(0, pos_y, vid_conheight - mySize_y);
+
+       if (pos_x + 0.5 * mySize_x > 0.5 * vid_conwidth)
+               pos_x = pos_x - vid_conwidth;
+       if (pos_y + 0.5 * mySize_y > 0.5 * vid_conheight)
+               pos_y = pos_y - vid_conheight;
+
+       string s;
+       s = strcat(ftos(pos_x), " ", ftos(pos_y));
+
+       cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_pos"), s);
+}
+
+float mouseClicked;
+float prevMouseClicked; // previous state
+float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary)
+{
+       prevMouseClicked = mouseClicked;
+       if(nPrimary == K_MOUSE1)
+       {
+               if(bInputType == 0) { // key pressed
+                       mouseClicked = 1;
+                       return true;
+               }
+               if(bInputType == 1) {// key released
+                       mouseClicked = 0;
+                       return true;
+               }
+       }
+       return false;
+}
+
+vector mousepos, mouseprevpos;
+vector mouseToPanelDistance;
+float highlightedPanel;
+float highlightedAction; // 0 = nothing, 1 = move, 2 = resize
+float resizeCorner; // 1 = topleft, 2 = topright, 3 = bottomleft, 4 = bottomright
+void HUD_Panel_Mouse()
+{
+       if(mouseClicked == 0) {
+               highlightedPanel = -1;
+               highlightedAction = 0;
+       }
+
+       mousepos = mousepos + getmousepos();
+
+       mousepos_x = bound(0, mousepos_x, vid_conwidth);
+       mousepos_y = bound(0, mousepos_y, vid_conheight);
+
+       drawpic(mousepos, "gfx/menu/default/cursor.tga", '32 32 0', '1 1 1', 1, hud_alpha_fg);
+
+       if(mouseClicked)
+       {
+               float i, marigin;
+               vector panelPos;
+               vector panelSize;
+
+               for(i = 0; i <= panel_cnt; i++)
+               {
+                       panelPos = HUD_Panel_GetPos(i);
+                       panelSize = HUD_Panel_GetSize(i);
+                       marigin = HUD_Panel_GetMarigin(i);
+                       if(prevMouseClicked == 0) {
+                               // move
+                               if(mousepos_x >= panelPos_x && mousepos_y >= panelPos_y && mousepos_x <= panelPos_x + panelSize_x && mousepos_y <= panelPos_y + panelSize_y)
+                               {
+                                       highlightedPanel = i;
+                                       highlightedAction = 1;
+                               }
+                               // resize from topleft border
+                               else if(mousepos_x >= panelPos_x - eX * marigin && mousepos_y >= panelPos_y - eX * marigin && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + 0.5 * panelSize_y)
+                               {
+                                       highlightedPanel = i;
+                                       highlightedAction = 2;
+                                       resizeCorner = 1;
+                               }
+                               // resize from topright border
+                               else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y - eX * marigin && mousepos_x <= panelPos_x + panelSize_x + eX * marigin && mousepos_y <= panelPos_y + 0.5 * panelSize_y)
+                               {
+                                       highlightedPanel = i;
+                                       highlightedAction = 2;
+                                       resizeCorner = 2;
+                               }
+                               // resize from bottomleft border
+                               else if(mousepos_x >= panelPos_x - eX * marigin && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + 0.5 * panelSize_x && mousepos_y <= panelPos_y + panelSize_y + eY * marigin)
+                               {
+                                       highlightedPanel = i;
+                                       highlightedAction = 2;
+                                       resizeCorner = 3;
+                               }
+                               // resize from bottomright border
+                               else if(mousepos_x >= panelPos_x + 0.5 * panelSize_x && mousepos_y >= panelPos_y + 0.5 * panelSize_y && mousepos_x <= panelPos_x + panelSize_x + eX * marigin && mousepos_y <= panelPos_y + panelSize_y + eY * marigin)
+                               {
+                                       highlightedPanel = i;
+                                       highlightedAction = 2;
+                                       resizeCorner = 4;
+                               }
+                       }
+
+                       if(highlightedPanel == i)
+                       {
+                               if(prevMouseClicked == 0)
+                                       mouseToPanelDistance = mousepos - panelPos;
+
+                               if(highlightedAction == 1)
+                                       HUD_Panel_SetPos(i, mousepos - mouseToPanelDistance, 0);
+                               else if(highlightedAction == 2)
+                               {
+                                       float didntresize; // panel too big/too small, dont resize (also has to affect moving)
+                                       if(resizeCorner == 1) {
+                                               didntresize = HUD_Panel_SetSize(i, panelSize + mouseprevpos - mousepos);
+                                               HUD_Panel_SetPos(i, mousepos - mouseToPanelDistance, didntresize);
+                                       }
+                                       if(resizeCorner == 2) {
+                                               didntresize = HUD_Panel_SetSize(i, panelSize + eX * (mousepos_x - mouseprevpos_x) + eY * (mouseprevpos_y - mousepos_y));
+                                               HUD_Panel_SetPos(i, eX * panelPos_x + eY * (mousepos_y - mouseToPanelDistance_y), didntresize);
+                                       }
+                                       if(resizeCorner == 3) {
+                                               didntresize = HUD_Panel_SetSize(i, panelSize + eX * (mouseprevpos_x - mousepos_x) + eY * (mousepos_y - mouseprevpos_y));
+                                               HUD_Panel_SetPos(i, eX * (mousepos_x - mouseToPanelDistance_x) + eY * panelPos_y, didntresize);
+                                       }
+                                       if(resizeCorner == 4) {
+                                               HUD_Panel_SetSize(i, panelSize + mousepos - mouseprevpos);
+                                       }
+                               }
+                       }
+               }
+       }
+       mouseprevpos = mousepos;
+       prevMouseClicked = mouseClicked;
+}
+
+/*void HUD_DrawDockEdge(float id, vector p1, vector p2, float target)
+{
+       vector pos;
+       vector size;
+
+       pos =
+*/ // maybe one day, since this will be quite complicated
+
+// Weapon icons (#0)
+//
+
+float weaponspace[10];
+void HUD_WeaponIcons_Clear()
+{
+       float idx;
+       for(idx = 0; idx < 10; ++idx)
+               weaponspace[idx] = 0;
+}
+
+void HUD_WeaponIcons()
+{
+       float alpha, height, marigin, accuracybar_height, stat_weapons; // "constants"
+       vector pos, color, accuracy_color;
+       float i, id, fade, weapon_stats, weapon_hit, weapon_damage, weapon_cnt; // variables
+
+       pos = HUD_Panel_GetPos(0);
+       height = cvar_or("hud_weaponicons_height", 12);
+       marigin = HUD_Panel_GetMarigin(0);
+       accuracybar_height = cvar_or("hud_weaponicons_accuracybar_height", 3);
+       color = HUD_Panel_GetColor(0);
+
+       stat_weapons = getstati(STAT_WEAPONS);
+       for(i = WEP_FIRST; i <= WEP_LAST; ++i)
+       {
+               self = get_weaponinfo(i);
+               if(self.weapons && self.impulse >= 0 && stat_weapons & self.weapons)
+                       ++weapon_cnt;
+       }
+
+       if(HUD_Panel_GetBgActive(0) && weapon_cnt)
+               draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", eX * (height * 2 * weapon_cnt + 2 * marigin) + eY * (height + 2 * marigin), color, hud_alpha_bg, '1 1 0' * (1/marigin));
+
+       // hits
+       weapon_stats = getstati(STAT_DAMAGE_HITS);
+       weapon_number = weapon_stats & 63;
+       weapon_hits[weapon_number-WEP_FIRST] = floor(weapon_stats / 64);
+       // fired
+       weapon_stats = getstati(STAT_DAMAGE_FIRED);
+       weapon_number = weapon_stats & 63;
+       weapon_fired[weapon_number-WEP_FIRST] = floor(weapon_stats / 64);
+
+       if(cvar_or("hud_weaponicons_fade", 1))
+       {
+               fade = 3.2 - 2 * (time - weapontime);
+               fade = bound(0.7, fade, 1);
+       }
+       else
+               fade = 1;
+
+       HUD_WeaponIcons_Clear();
+
+       for(i = WEP_FIRST; i <= WEP_LAST; ++i)
+       {
+               self = get_weaponinfo(i);
+               if(self.weapons && self.impulse >= 0 && stat_weapons & self.weapons)
+               {
+                       id = self.impulse;
+
+                       alpha = (id == activeweapon) ? 1 : 0.6;
+
+                       weapon_hit = weapon_hits[self.weapon-WEP_FIRST];
+                       weapon_damage = weapon_fired[self.weapon-WEP_FIRST];
+                       if(id == 0) // porto and hook should be last
+                               id = 9;
+                       else
+                               id = --id;
+
+                       if(id+1 == activeweapon)
+                               drawpic(pos, "gfx/hud/sb_ammobg", eX * (2 * height) + eY * height, color, fade * hud_alpha_fg, DRAWFLAG_NORMAL);
+                       drawpic(pos, strcat("gfx/hud/inv_weapon", self.netname), eX * 2 * height + eY * height, '1 1 1', fade * hud_alpha_fg, DRAWFLAG_NORMAL);
+                       //pos_y += size * 1/6; TODO: support for vertical mode
+                       if(cvar_or("hud_weaponicons_number", 1))
+                               drawstring(pos, ftos(id+1), '1 1 0' * 0.5 * height, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+
+                       // draw the weapon accuracy on the HUD
+                       if(hud_accuracy_hud && !(gametype == GAME_RACE || gametype == GAME_CTS))
+                       {
+                               if(weapon_damage)
+                                       weapon_stats = floor(100 * weapon_hit / weapon_damage);
+
+                               accuracy_color = HUD_AccuracyColor(weapon_stats);
+                               if(weapon_damage)
+                                       drawpic(pos - '2 0 0' + eY * (height - accuracybar_height), "gfx/hud/sb_accuracy_bar.tga", eX * 2 * height + eY * accuracybar_height, accuracy_color, hud_alpha_fg, DRAWFLAG_NORMAL);
+                       }
+                       pos_x += height * 2;
+               }
+
+       }
+
+}
+
+// Inventory (#1)
+//
+
+float GetAmmoStat(float i)
+{
+       switch(i)
+       {
+               case 0: return STAT_SHELLS;
+               case 1: return STAT_NAILS;
+               case 2: return STAT_ROCKETS;
+               case 3: return STAT_CELLS;
+               case 4: return STAT_FUEL;
+               default: return -1;
+       }
+}
+
+float GetAmmoItemCode(float i)
+{
+       switch(i)
+       {
+               case 0: return IT_SHELLS;
+               case 1: return IT_NAILS;
+               case 2: return IT_ROCKETS;
+               case 3: return IT_CELLS;
+               case 4: return IT_FUEL;
+               default: return -1;
+       }
+}
+
+string GetAmmoPicture(float i)
+{
+       switch(i)
+       {
+               case 0: return "gfx/hud/sb_shells";
+               case 1: return "gfx/hud/sb_bullets";
+               case 2: return "gfx/hud/sb_rocket";
+               case 3: return "gfx/hud/sb_cells";
+               case 4: return "gfx/hud/sb_fuel";
+               default: return "";
+       }
+}
+
+void HUD_Inventory()
+{
+       float i;
+       float stat_items;
+       float marigin;
+
+       vector pos, mySize, mysize, mypos, color;
+       marigin = HUD_Panel_GetMarigin(1);
+       pos = HUD_Panel_GetPos(1);
+       mySize = HUD_Panel_GetSize(1);
+       color = HUD_Panel_GetColor(1);
+
+       if(HUD_Panel_GetBgActive(1))
+               draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+
+       // ammo
+       stat_items = getstati(STAT_ITEMS);
+       for (i = 0; i < 4; ++i) {
+               float a;
+               a = getstati(GetAmmoStat(i)); // how much ammo do we have of type i?
+
+               if(cvar("hud_ammo_onlycurrent")) { // force showing current ammo only with conwidths < 800
+                       if (stat_items & GetAmmoItemCode(i)) {
+                               drawpic(pos - '1 1 0' * marigin, "gfx/hud/sb_ammobg", mysize + '1 1 0' * marigin, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+                               drawpic(pos + eX * mysize_x * 1.7, GetAmmoPicture(i), '24 24 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+                               if(a < 10)
+                                       HUD_DrawXNum(pos + '5 5 0', a, 3, 0, 24, '0.7 0 0', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+                               else
+                                       HUD_DrawXNum(pos + '5 5 0', a, 3, 0, 24, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+                       }
+               } else {
+                       if (a > 0) {
+                               if(mySize_x/mySize_y >= 10) { // arrange horizontally
+                                       switch (i) {
+                                               case 0: mypos_x = pos_x;                        mypos_y = pos_y;                        break; // shells
+                                               case 1: mypos_x = pos_x + 0.25 * mySize_x;      mypos_y = pos_y;                        break; // bullets
+                                               case 2: mypos_x = pos_x + 0.5  * mySize_x;      mypos_y = pos_y;                        break; // rockets
+                                               case 3: mypos_x = pos_x + 0.75 * mySize_x;      mypos_y = pos_y;                        break; // cells
+                                       }
+                                       mysize_x = 0.25 * mySize_x;
+                                       mysize_y = mySize_y;
+                               } else if(mySize_x/mySize_y >= 2.5) { // arrange in a 2x2 grid
+                                       switch (i) {
+                                               case 0: mypos_x = pos_x + 0.5 * mySize_x;       mypos_y = pos_y + 0.5 * mySize_y;       break; // shells
+                                               case 1: mypos_x = pos_x + 0.5 * mySize_x;       mypos_y = pos_y;                        break; // bullets
+                                               case 2: mypos_x = pos_x;                        mypos_y = pos_y + 0.5 * mySize_y;       break; // rockets
+                                               case 3: mypos_x = pos_x;                        mypos_y = pos_y;                        break; // cells
+                                       }
+                                       mysize_x = 0.5 * mySize_x;
+                                       mysize_y = 0.5 * mySize_y;
+                               } else { // arrange vertically
+                                       switch (i) {
+                                               case 0: mypos_x = pos_x;                        mypos_y = pos_y;                        break; // shells
+                                               case 1: mypos_x = pos_x;                        mypos_y = pos_y + 0.25 * mySize_y;      break; // bullets
+                                               case 2: mypos_x = pos_x;                        mypos_y = pos_y + 0.5  * mySize_y;      break; // rockets
+                                               case 3: mypos_x = pos_x;                        mypos_y = pos_y + 0.75 * mySize_y;      break; // cells
+                                       }
+                                       mysize_x = mySize_x;
+                                       mysize_y = 0.25 * mySize_y;
+                               }
+
+                               if (stat_items & GetAmmoItemCode(i))
+                                       drawpic(mypos, "gfx/hud/sb_ammobg", mysize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+                               drawpic(mypos + eX * 0.66 * mysize_x + eY * 0.05 * mysize_y, GetAmmoPicture(i), '1 1 0' * 0.8 * mysize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+                               if (a < 10) {
+                                       if(stat_items & GetAmmoItemCode(i))
+                                               HUD_DrawXNum(mypos + '6 4.5 0', a, 3, 0, 16, '0.7 0 0', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+                                       else
+                                               HUD_DrawXNum(mypos + '6 4.5 0', a, 3, 0, 16, '0.7 0 0', 0, 0, hud_alpha_fg * 0.7, DRAWFLAG_NORMAL);
+                               } else {
+                                       if(stat_items & GetAmmoItemCode(i))
+                                               HUD_DrawXNum(mypos + '1 1 0' * 0.26 * mysize_y, a, 3, 0, 0.5 * mysize_y, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+                                       else
+                                               HUD_DrawXNum(mypos + '1 1 0' * 0.26 * mysize_y, a, 3, 0, 0.5 * mysize_y, '0.7 0.7 0.7', 0, 0, hud_alpha_fg * 0.7, DRAWFLAG_NORMAL);
+                               }
+                       }
+               }
+       }
+
+       // fuel ammo
+       a = getstati(GetAmmoStat(4)); // how much fuel do we have?
+
+       if (a > 0) { // if we have fuel, draw the amount
+               float invincibility_time, dt;
+               invincibility_time = getstatf(STAT_INVINCIBLE_FINISHED);
+               dt = invincibility_time - time;
+               if (dt > 0) { // if the invincibility timer is active, draw fuel ammo elsewhere
+                       pos_x += 140;
+                       pos_y += -72;
+               }
+               else { // if the invincibility timer is inactive, draw the fuel ammo there (it's rare to have invincibility + fuel anyway)
+                       pos_x += 140;
+                       pos_y += -20;
+               }
+               drawpic(pos - '0 2 0' + '52 0 0', GetAmmoPicture(4), '20 20 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+               if (a > 10)
+                       HUD_DrawXNum(pos, a, 3, 0, 16, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+               else
+                       HUD_DrawXNum(pos, a, 3, 0, 16, '0.7 0 0', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+       }
+}
+
+
+// Powerups (#2)
+// TODO!
+void HUD_Powerups() {
+       float stat_items, dt;
+       float marigin;
+
+       vector pos, mySize, color;
+       marigin = HUD_Panel_GetMarigin(2);
+       pos = HUD_Panel_GetPos(2);
+       mySize = HUD_Panel_GetSize(2);
+       color = HUD_Panel_GetColor(2);
+
+       if(HUD_Panel_GetBgActive(2))
+               draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+
+       stat_items = getstati(STAT_ITEMS);
+       /*
+       if not(stat_items & IT_STRENGTH)
+               if not(stat_items & IT_INVINCIBLE)
+                       return;
+       */
+
+       if (getstati(STAT_HEALTH) <= 0)
+               return;
+
+       float strength_time, invincibility_time, countdown_fontsize;
+
+       //strength
+       strength_time = getstatf(STAT_STRENGTH_FINISHED);
+       invincibility_time = getstatf(STAT_INVINCIBLE_FINISHED);
+
+       if (strength_time) {
+               dt = strength_time - time;
+               if(dt > 0)
+               {
+                       if(dt < 5)
+                       {
+                               drawpic_expanding_two(pos, "gfx/hud/sb_str", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE,
+                                       bound(0, (ceil(dt) - dt) / 0.5, 1));
+                       }
+                       else
+                       {
+                               drawpic(pos, "gfx/hud/sb_str", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE);
+                       }
+                       HUD_DrawXNum(pos - '40 -2 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+               }
+               else if(dt > -1)
+               {
+                       drawpic_expanding(pos, "gfx/hud/sb_str", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE,
+                               bound(0, -dt / 0.5, 1));
+               }
+       }
+
+       //invincibility
+       if (invincibility_time) {
+               dt = invincibility_time - time;
+               if(dt > 0)
+               {
+                       if(dt < 5)
+                       {
+                               drawpic_expanding_two(pos - '0 -22 0', "gfx/hud/sb_invinc", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE,
+                                       bound(0, (ceil(dt) - dt) / 0.5, 1));
+                       }
+                       else
+                       {
+                               drawpic(pos - '0 -22 0', "gfx/hud/sb_invinc", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE);
+                       }
+                       HUD_DrawXNum(pos - '40 -24 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+               }
+               else if(dt > -1)
+               {
+                       drawpic_expanding(pos - '0 -22 0', "gfx/hud/sb_invinc", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE,
+                               bound(0, -dt / 0.5, 1));
+               }
+       }
+}
+
+// Health/armor (#3)
+//
+void HUD_HealthArmor(void)
+{
+       float marigin;
+
+       vector pos, mySize, color;
+       marigin = HUD_Panel_GetMarigin(3);
+       pos = HUD_Panel_GetPos(3);
+       mySize = HUD_Panel_GetSize(3);
+       color = HUD_Panel_GetColor(3);
+
+       if(HUD_Panel_GetBgActive(3))
+               draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+
+       float armor, health, x;
+       armor = getstati(STAT_ARMOR);
+       health = getstati(STAT_HEALTH);
+
+       if(hud_hudselector == 2) // combined health and armor display
+       {
+               vector v;
+               v = healtharmor_maxdamage(health, armor, armorblockpercent);
+
+               vector num_pos;
+               num_pos = - '96 28 0';
+
+               x = floor(v_x + 1);
+
+               if(v_z) // fully armored
+               {
+                       // here, armorideal > armor
+                       drawpic(num_pos + '78 -4.5 0', "gfx/hud/sb_health", '32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+                       drawpic(num_pos + '108 -4.5 0', "gfx/hud/sb_armor", '20 20 0', '1 1 1', hud_alpha_fg * armor / v_y, DRAWFLAG_NORMAL);
+               }
+               else
+               {
+                       drawpic(num_pos + '108 -4.5 0', "gfx/hud/sb_health", '20 20 0', '1 1 1', hud_alpha_fg * v_y / armor, DRAWFLAG_NORMAL);
+                       drawpic(num_pos + '78 -4.5 0', "gfx/hud/sb_armor", '32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+               }
+               HUD_DrawXNum_Colored(num_pos, x, 24, hud_alpha_fg); // draw the combined health and armor
+       }
+
+       else
+       {
+               vector health_pos, armor_pos;
+
+               if (hud_hudselector == 0) { // old style layout with armor left of health
+                       armor_pos = pos;
+                       health_pos = pos + eX * 0.5 * mySize_x;
+               }
+               else {
+                       health_pos = pos;
+                       armor_pos = pos + eX * 0.5 * mySize_x;
+               }
+
+               // armor
+               x = armor;
+               if (x > 0)
+               {
+                       if (x > 45)
+                               drawpic(armor_pos + eX * 0.35 * mySize_x, "gfx/hud/sb_armor", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+                       else
+                               drawpic(armor_pos + eX * 0.35 * mySize_x, "gfx/hud/sb_armor", '1 1 0' *  mySize_y, '1 1 1', (x+10)/55 * hud_alpha_fg, DRAWFLAG_NORMAL);
+                       HUD_DrawXNum_Colored(armor_pos + eY * 0.25 * mySize_y, x, 0.5 * mySize_y, hud_alpha_fg);
+               }
+
+               // health
+               x = health;
+               drawpic(health_pos + eX * 0.35 * mySize_x, "gfx/hud/sb_health", '1 1 0' * mySize_y, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+               HUD_DrawXNum_Colored(health_pos + eY * 0.25 * mySize_y, x, 0.5 * mySize_y, hud_alpha_fg);
+       }
+}
+
+// Score (#7)
+//
+void HUD_Score()
+{
+       float marigin;
+
+       vector pos, mySize, color;
+       marigin = HUD_Panel_GetMarigin(7);
+       pos = HUD_Panel_GetPos(7);
+       mySize = HUD_Panel_GetSize(7);
+       color = HUD_Panel_GetColor(7);
+
+       if(HUD_Panel_GetBgActive(7))
+               draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+
+       float score, distribution, leader;
+       vector score_pos, secondary_score_pos, distribution_color;
+       entity tm, pl, me;
+       me = (spectatee_status > 0) ? playerslots[spectatee_status - 1] : playerslots[player_localentnum - 1];
+
+       if (!teamplay) { // non-teamgames
+               // me vector := [team/connected frags id]
+               pl = players.sort_next;
+               if(pl == me)
+                       pl = pl.sort_next;
+
+               if(pl)
+                       distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]);
+               else
+                       distribution = 0;
+
+               score = me.(scores[ps_primary]);
+
+               if(distribution >= 5) {
+                       distribution_color = eY;
+                       leader = 1;
+               } else if(distribution >= 0) {
+                       distribution_color = '1 1 1';
+                       leader = 1;
+               } else if(distribution >= -5)
+                       distribution_color = '1 1 0';
+               else
+                       distribution_color = eX;
+
+               HUD_DrawXNum(pos + eX * mySize_x - eX * 6 * 0.3  * mySize_y, distribution, 6, 3, 0.3 * mySize_y, distribution_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+               HUD_DrawXNum(pos + eX * mySize_x - eX * 6 * 0.75 * mySize_y + eY * 0.35 * mySize_y, score, 6, 0, 0.75 * mySize_y, distribution_color, leader, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+       } else { // teamgames
+               float max_fragcount;
+               max_fragcount = -999;
+
+               for(tm = teams.sort_next; tm; tm = tm.sort_next) {
+                       if(tm.team == COLOR_SPECTATOR || !tm.team_size) // no players? don't display
+                               continue;
+                       score = tm.(teamscores[ts_primary]);
+                       leader = 0;
+
+                       if (score > max_fragcount)
+                               max_fragcount = score;
+
+                       if(tm.team == myteam) {
+                               if (max_fragcount == score)
+                                       leader = 1;
+                               HUD_DrawXNum(score_pos, score, 4, 0, 34, GetTeamRGB(tm.team) * 0.8, leader, 1, hud_alpha_fg, DRAWFLAG_NORMAL);
+                       } else {
+                               if (max_fragcount == score)
+                                       leader = 1;
+                               HUD_DrawXNum(secondary_score_pos, score, 6, 0, 16, GetTeamRGB(tm.team) * 0.8, leader, 1, hud_alpha_fg, DRAWFLAG_NORMAL);
+                               secondary_score_pos = secondary_score_pos + '0 16 0';
+                       }
+               }
+       }
+}
+
+// Race timer (#8)
+//
+void HUD_RaceTimer (void) {
+       float marigin;
+
+       vector pos, mySize, color;
+       marigin = HUD_Panel_GetMarigin(8);
+       pos = HUD_Panel_GetPos(8);
+       mySize = HUD_Panel_GetSize(8);
+       color = HUD_Panel_GetColor(8);
+
+       if(HUD_Panel_GetBgActive(8))
+               draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+
+       drawfont = sbar_bigfont;
+       float a, t;
+       string s, forcetime;
+
+       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)
+               {
+                       dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
+                       //drawcolorcodedstring(m - '0 16 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', hud_alpha_fg * a, DRAWFLAG_NORMAL);
+                       drawcolorcodedstring(pos, s, '1 1 0' * mySize_y, hud_alpha_fg * a, DRAWFLAG_NORMAL);
+               }
+
+               if(race_penaltytime)
+               {
+                       a = bound(0, 2 - (time - race_penaltyeventtime), 1);
+                       if(a > 0)
+                       {
+                               s = strcat("^1PENALTY: ", ftos_decimals(race_penaltytime * 0.1, 1), " (", race_penaltyreason, ")");
+                               dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
+                               //drawcolorcodedstring(m - '0 32 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', hud_alpha_fg * a, DRAWFLAG_NORMAL);
+                               drawcolorcodedstring(pos - '0 32 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', hud_alpha_fg * a, DRAWFLAG_NORMAL);
+                       }
+               }
+
+               if(forcetime != "")
+               {
+                       a = bound(0, (time - race_checkpointtime) / 0.5, 1);
+                       //drawstring_expanding(m - '16 0 0' * stringwidth(forcetime, FALSE), forcetime, '32 32 0', '1 1 1', hud_alpha_fg, 0, a);
+                       drawstring_expanding(pos - eX * stringwidth(forcetime, FALSE, '16 0 0'), forcetime, '32 32 0', '1 1 1', hud_alpha_fg, 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(m - '16 0 0' * stringwidth(s, FALSE), s, '32 32 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL);
+                       drawstring(pos - '0.5 0 0' * stringwidth(s, FALSE, '32 32 0'), s, '32 32 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL);
+               }
+       }
+       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);
+                       dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
+                       //drawcolorcodedstring(m - '0 16 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', hud_alpha_fg * a, DRAWFLAG_NORMAL);
+                       drawcolorcodedstring(pos - '0 16 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', hud_alpha_fg * 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);
+                       dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
+                       //drawcolorcodedstring(m - '0 0 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', hud_alpha_fg * a, DRAWFLAG_NORMAL);
+                       drawcolorcodedstring(pos - '0 0 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', hud_alpha_fg * 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 = strcat("^1PENALTY: ", ftos_decimals(t - time, 1), " (", race_penaltyreason, ")");
+                               else
+                                       s = strcat("^2PENALTY: 0.0 (", race_penaltyreason, ")");
+                               dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
+                               //drawcolorcodedstring(m - '0 32 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', hud_alpha_fg * a, DRAWFLAG_NORMAL);
+                               drawcolorcodedstring(pos - '0 32 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', hud_alpha_fg * a, DRAWFLAG_NORMAL);
+                       }
+               }
+       }
+
+       drawfont = sbar_font;
+}
+
+
+
+
+
+
+
+// Notification area (#4)
+// OH MY GOOODDDDDD this thing is colossal :/
+// TODO
+float vote_yescount;
+float vote_nocount;
+float vote_needed;
+float vote_highlighted; // currently selected vote
+
+float vote_active; // is there an active vote?
+float vote_prev; // previous state of vote_active to check for a change
+float vote_alpha;
+float vote_change; // "time" when vote_active changed
+
+/*
+{
+       if(spectatee_status && !intermission)
+       {
+               drawfont = sbar_bigfont;
+               if(spectatee_status == -1)
+                       s = "^1Observing";
+               else
+                       s = GetPlayerName(spectatee_status - 1);
+               // spectated player name between HUD and chat area, aligned to the left
+               pos_x = 0;
+               pos_y = - 50 - sbar_fontsize_spec_y;
+               s = textShortenToWidth(s, vid_conwidth/2.5, sbar_fontsize_spec, stringwidth_colors);
+               drawcolorcodedstring(pos, s, sbar_fontsize_spec, hud_alpha_fg, DRAWFLAG_NORMAL);
+               drawfont = sbar_font;
+
+               // spectator text in the upper right corner
+               if(spectatee_status == -1)
+                       s = strcat("^1Press ^3", getcommandkey("primary fire", "+attack"), "^1 to spectate");
+               else
+                       s = strcat("^1Press ^3", getcommandkey("primary fire", "+attack"), "^1 for another player");
+
+               if(spectatee_status == -1)
+                       s = strcat("^1Use ^3", getcommandkey("next weapon", "weapnext"), "^1 or ^3", getcommandkey("previous weapon", "weapprev"), "^1 to change the speed");
+               else
+                       s = strcat("^1Press ^3", getcommandkey("secondary fire", "+attack2"), "^1 to observe");
+
+               s = strcat("^1Press ^3", getcommandkey("server info", "+show_info"), "^1 for gamemode info");
+
+               if(gametype == GAME_ARENA)
+                       s = "^1Wait for your turn to join";
+               else if(gametype == GAME_LMS)
+               {
+                       entity sk;
+                       sk = playerslots[player_localentnum - 1];
+                       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 = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join");
+               }
+               else
+                       s = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join");
+
+               //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 = strcat("^1Game starts in ^3", ftos(countdown), "^1 seconds");
+               }
+       }
+       if(warmup_stage && !intermission)
+       {
+               s = "^2Currently in ^1warmup^2 stage!";
+       }
+
+       // move more important stuff more to the middle so its more visible
+
+       string blinkcolor;
+       if(mod(time, 1) >= 0.5)
+               blinkcolor = "^1";
+       else
+               blinkcolor = "^3";
+
+       if(ready_waiting && !intermission && !spectatee_status)
+       {
+               if(ready_waiting_for_me)
+               {
+                       if(warmup_stage)
+                               s = strcat(blinkcolor, "Press ^3", getcommandkey("ready", "ready"), blinkcolor, " to end warmup");
+                       else
+                               s = strcat(blinkcolor, "Press ^3", getcommandkey("ready", "ready"), blinkcolor, " once you are ready");
+               }
+               else
+               {
+                       if(warmup_stage)
+                               s = strcat("^2Waiting for others to ready up to end warmup...");
+                       else
+                               s = strcat("^2Waiting for others to ready up...");
+               }
+       }
+       else if(warmup_stage && !intermission && !spectatee_status)
+       {
+               s = strcat("^2Press ^3", getcommandkey("ready", "ready"), "^2 to end warmup");
+       }
+
+       if(teamplay && !intermission && !spectatee_status && gametype != GAME_CA && teamnagger)
+       {
+               float ts_min, ts_max;
+               tm = teams.sort_next;
+               if (tm)
+               {
+                       for(; tm.sort_next; tm = tm.sort_next)
+                       {
+                               if(!tm.team_size || tm.team == COLOR_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 != COLOR_SPECTATOR)
+                               if (tm.team_size == ts_max)
+                                       s = strcat(s, " Press ^3", getcommandkey("team menu", "menu_showteamselect"), blinkcolor, " to adjust");
+
+                       }
+               }
+       }
+
+       if(vote_active != vote_prev) {
+               vote_change = time;
+               vote_prev = bound(0, vote_active, 1);
+       }
+
+       if(vote_active)
+               vote_alpha = bound(0, (time - vote_change) * 2, 1);
+       else
+               vote_alpha = bound(0, 1 - (time - vote_change) * 2, 1);
+
+       if(vote_alpha) {
+               a = vote_alpha * bound(cvar_or("hud_vote_alreadyvoted_alpha", 0.75), 1 - vote_highlighted, 1);
+
+               vector voteorigin = bottomright - '290 135 0';
+               vector votesize = '280 70 0';
+               drawpic(voteorigin, "gfx/hud/voteprogress_back", votesize, HUD_GetBgColor(), a * hud_alpha_bg, DRAWFLAG_NORMAL);
+
+               s = "A vote has been called for: ";
+               drawstring(voteorigin + '0.5 0 0' * votesize_x + '0 0.1 0' * votesize_y - eX * stringwidth(s, FALSE, '6 0 0'), s, '12 12 0', '1 1 1', a * hud_alpha_fg, DRAWFLAG_NORMAL);
+               s = textShortenToWidth(vote_called_vote, votesize_x * 0.96, '10 0 0', stringwidth_colors);
+               drawcolorcodedstring(voteorigin + '0.52 0 0' * votesize_x + '0 0.3 0' * votesize_y - eX * stringwidth(s, FALSE, '5 0 0'), s, '10 10 0', a * hud_alpha_fg, DRAWFLAG_NORMAL);
+
+               // print the yes/no counts
+               s = strcat("Yes: ", ftos(vote_yescount));
+               drawstring(voteorigin + '0 0.6 0' * votesize_y + '0.02 0 0' * votesize_x, s, '12 12 0', eY, a * hud_alpha_fg, DRAWFLAG_NORMAL);
+               s = strcat("No: ", ftos(vote_nocount));
+               drawstring(voteorigin + '0 0.6 0' * votesize_y + '0.98 0 0' * votesize_x - eX * stringwidth(s, FALSE, '12 0 0'), s, '12 12 0', eX, a * hud_alpha_fg, DRAWFLAG_NORMAL);
+
+               // draw the progress bars
+               drawsetcliparea(voteorigin_x, voteorigin_y, votesize_x * 0.5 * (vote_yescount/vote_needed), votesize_y);
+               drawpic(voteorigin, "gfx/hud/voteprogress_prog", votesize, eY, a * hud_alpha_fg, DRAWFLAG_NORMAL);
+
+               drawsetcliparea(voteorigin_x + votesize_x - votesize_x * 0.5 * (vote_nocount/vote_needed), voteorigin_y, votesize_x * 0.5, votesize_y);
+               drawpic(voteorigin, "gfx/hud/voteprogress_prog", votesize, eX, a * hud_alpha_fg, DRAWFLAG_NORMAL);
+
+               // draw the highlights
+               if(vote_highlighted == 1) {
+                       drawsetcliparea(voteorigin_x, voteorigin_y, votesize_x * 0.5, votesize_y);
+                       drawpic(voteorigin, "gfx/hud/voteprogress_voted", votesize, eY, a * hud_alpha_fg, DRAWFLAG_NORMAL);
+               }
+               else if(vote_highlighted == 2) {
+                       drawsetcliparea(voteorigin_x + 0.5 * votesize_x, voteorigin_y, votesize_x * 0.5, votesize_y);
+                       drawpic(voteorigin, "gfx/hud/voteprogress_voted", votesize, eX, a * hud_alpha_fg, DRAWFLAG_NORMAL);
+               }
+
+               drawresetcliparea();
+       }
+       else if(!vote_active) {
+               vote_highlighted = 0;
+       }
+}
+
+*/
+// Awards system
+float race_status_time;
+float race_status_prev;
+string race_status_name_prev;
+void HUD_DrawRaceStatus(vector pos)
+{
+       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);
+       }
+
+       float a;
+       a = bound(0, race_status_time - time, 1);
+
+       string s;
+       s = textShortenToWidth(race_status_name, 120, '10 10 0', stringwidth_colors);
+
+       float rank;
+       if(race_status > 0)
+               rank = race_CheckName(race_status_name);
+       string rankname;
+       rankname = race_PlaceName(rank);
+
+       if(race_status == 0)
+               drawpic(pos, "gfx/hud/race/newfail", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL);
+       else if(race_status == 1) {
+               drawpic(pos, "gfx/hud/race/newtime", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL);
+               drawcolorcodedstring(pos + '40 80 0' - eX * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', hud_alpha_fg * a, DRAWFLAG_NORMAL);
+               drawstring(pos + '40 20 0' - eX * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL);
+       } else if(race_status == 2) {
+               if(race_status_name == GetPlayerName(player_localentnum -1) || !race_myrank || race_myrank < rank)
+                       drawpic(pos, "gfx/hud/race/newrankgreen", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL);
+               else
+                       drawpic(pos, "gfx/hud/race/newrankyellow", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL);
+               drawcolorcodedstring(pos + '40 80 0' - eX * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', hud_alpha_fg * a, DRAWFLAG_NORMAL);
+               drawstring(pos + '40 20 0' - eX * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL);
+       } else if(race_status == 3) {
+               drawpic(pos, "gfx/hud/race/newrecordserver", '80 80 0', '1 1 1', hud_alpha_fg * a, DRAWFLAG_NORMAL);
+               drawcolorcodedstring(pos + '40 80 0' - eX * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', hud_alpha_fg * a, DRAWFLAG_NORMAL);
+               drawstring(pos + '40 20 0' - eX * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', hud_alpha_fg * 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;
+       }
+}
+
+// CTF HUD modicon section
+float redflag_prevframe, blueflag_prevframe; // status during previous frame
+float redflag_prevstatus, blueflag_prevstatus; // last remembered status
+float redflag_statuschange_time, blueflag_statuschange_time; // time when the status changed
+
+void CSQC_ctf_hudreset(void)
+{
+       redflag_prevstatus = blueflag_prevstatus = redflag_prevframe = blueflag_prevframe = redflag_statuschange_time = blueflag_statuschange_time = 0;
+}
+
+void CSQC_ctf_hud(void)
+{
+       vector bottomleft, redflag_pos, blueflag_pos, sz;
+       float f; // every function should have that
+       bottomleft_y = vid_conheight;
+       bottomleft_z = 0;
+
+       float redflag, blueflag; // current status
+       float redflag_statuschange_elapsedtime, blueflag_statuschange_elapsedtime; // time since the status changed
+       float stat_items;
+
+       stat_items = getstati(STAT_ITEMS);
+       redflag = (stat_items/IT_RED_FLAG_TAKEN) & 3;
+       blueflag = (stat_items/IT_BLUE_FLAG_TAKEN) & 3;
+
+       // when status CHANGES, set old status into prevstatus and current status into status
+       if (redflag != redflag_prevframe)
+       {
+               redflag_statuschange_time = time;
+               redflag_prevstatus = redflag_prevframe;
+               redflag_prevframe = redflag;
+       }
+
+       if (blueflag != blueflag_prevframe)
+       {
+               blueflag_statuschange_time = time;
+               blueflag_prevstatus = blueflag_prevframe;
+               blueflag_prevframe = blueflag;
+       }
+
+       redflag_statuschange_elapsedtime = time - redflag_statuschange_time;
+       blueflag_statuschange_elapsedtime = time - blueflag_statuschange_time;
+
+       float BLINK_FACTOR = 0.15;
+       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
+       float BLINK_FREQ = 5; // circle frequency, = 2*pi*frequency in hertz
+
+       string red_icon, red_icon_prevstatus;
+       float red_alpha, red_alpha_prevstatus;
+       red_alpha = red_alpha_prevstatus = 1;
+       switch(redflag) {
+               case 1: red_icon = "gfx/hud/sb_flag_red_taken"; break;
+               case 2: red_icon = "gfx/hud/sb_flag_red_lost"; break;
+               case 3: red_icon = "gfx/hud/sb_flag_red_carrying"; red_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;
+               default:
+                       if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM2))
+                               red_icon = "gfx/hud/sb_flag_red_shielded";
+                       else
+                               red_icon = string_null;
+                       break;
+       }
+       switch(redflag_prevstatus) {
+               case 1: red_icon_prevstatus = "gfx/hud/sb_flag_red_taken"; break;
+               case 2: red_icon_prevstatus = "gfx/hud/sb_flag_red_lost"; break;
+               case 3: red_icon_prevstatus = "gfx/hud/sb_flag_red_carrying"; red_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;
+               default:
+                       if(redflag == 3)
+                               red_icon_prevstatus = "gfx/hud/sb_flag_red_carrying"; // make it more visible
+                       else if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM2))
+                               red_icon_prevstatus = "gfx/hud/sb_flag_red_shielded";
+                       else
+                               red_icon_prevstatus = string_null;
+                       break;
+       }
+
+       string blue_icon, blue_icon_prevstatus;
+       float blue_alpha, blue_alpha_prevstatus;
+       blue_alpha = blue_alpha_prevstatus = 1;
+       switch(blueflag) {
+               case 1: blue_icon = "gfx/hud/sb_flag_blue_taken"; break;
+               case 2: blue_icon = "gfx/hud/sb_flag_blue_lost"; break;
+               case 3: blue_icon = "gfx/hud/sb_flag_blue_carrying"; blue_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;
+               default:
+                       if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM1))
+                               blue_icon = "gfx/hud/sb_flag_blue_shielded";
+                       else
+                               blue_icon = string_null;
+                       break;
+       }
+       switch(blueflag_prevstatus) {
+               case 1: blue_icon_prevstatus = "gfx/hud/sb_flag_blue_taken"; break;
+               case 2: blue_icon_prevstatus = "gfx/hud/sb_flag_blue_lost"; break;
+               case 3: blue_icon_prevstatus = "gfx/hud/sb_flag_blue_carrying"; blue_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;
+               default:
+                       if(blueflag == 3)
+                               blue_icon_prevstatus = "gfx/hud/sb_flag_blue_carrying"; // make it more visible
+                       else if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM1))
+                               blue_icon_prevstatus = "gfx/hud/sb_flag_blue_shielded";
+                       else
+                               blue_icon_prevstatus = string_null;
+                       break;
+       }
+
+       if (myteam == COLOR_TEAM1) { // always draw own flag on left
+               redflag_pos = bottomleft - '-4 50 0';
+               blueflag_pos = bottomleft - '-62 50 0';
+       } else {
+               blueflag_pos = bottomleft - '-4 50 0';
+               redflag_pos = bottomleft - '-62 50 0';
+       }
+
+       sz = '52 52 0';
+
+       f = bound(0, redflag_statuschange_elapsedtime*2, 1);
+       if(red_icon_prevstatus && f < 1)
+               drawpic_expanding(redflag_pos, red_icon_prevstatus, sz, '1 1 1', hud_alpha_fg * red_alpha_prevstatus, DRAWFLAG_NORMAL, f);
+       if(red_icon)
+               drawpic(redflag_pos, red_icon, sz, '1 1 1', hud_alpha_fg * red_alpha * f, DRAWFLAG_NORMAL);
+
+       f = bound(0, blueflag_statuschange_elapsedtime*2, 1);
+       if(blue_icon_prevstatus && f < 1)
+               drawpic_expanding(blueflag_pos, blue_icon_prevstatus, sz, '1 1 1', hud_alpha_fg * blue_alpha_prevstatus, DRAWFLAG_NORMAL, f);
+       if(blue_icon)
+               drawpic(blueflag_pos, blue_icon, sz, '1 1 1', hud_alpha_fg * blue_alpha * f, DRAWFLAG_NORMAL);
+}
+
+/*void HUD_Mod_Race (void) {
+       if((scores_flags[ps_primary] & SFL_TIME) && !teamplay) { // race/cts record display on HUD
+               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]);
+
+               float racemin, racesec, racemsec;
+               float distsec, distmsec, minusplus;
+
+               racemin = floor(score/(60 * TIME_FACTOR));
+               racesec = floor((score - racemin*(60 * TIME_FACTOR))/TIME_FACTOR);
+               racemsec = score - racemin*60*TIME_FACTOR - racesec*TIME_FACTOR;
+
+               if (pl && ((!(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)) || score)) {
+                       // distribution display
+                       distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]);
+
+                       if (distribution < TIME_FACTOR && distribution > -TIME_FACTOR)
+                               distmsec = fabs(distribution);
+                       else {
+                               distsec = floor(fabs(distribution)/TIME_FACTOR);
+                               distmsec = fabs(distribution) - distsec*TIME_FACTOR;
+                               if (distribution < 0)
+                                       distsec = -distsec;
+                       }
+
+                       if (distribution <= 0) {
+                               distribution_color = eY;
+                               minusplus = 1; // minusplus 1: always prefix with minus sign
+                       }
+                       else {
+                               distribution_color = eX;
+                               minusplus = 2; // minusplus 1: always prefix with plus sign
+                       }
+                       HUD_DrawXNum(bottomright - '0 48 0' - '16 0 0' * TIME_DECIMALS, distmsec, -TIME_DECIMALS, 0, 16, distribution_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+                       HUD_DrawXNum(bottomright - '68 48 0' - '16 0 0' * TIME_DECIMALS, distsec, 4, minusplus, 16, distribution_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+                       drawpic(bottomright - '10 48 0' - '16 0 0' * TIME_DECIMALS, "gfx/hud/num_dot", '16 16 0', distribution_color, hud_alpha_fg, DRAWFLAG_ADDITIVE);
+               }
+               // race record display
+               if (distribution <= 0 || distribution == score) // draw the highlight background behind the timer if we have the lead
+                       drawpic(bottomright - '0 32 0' - '32 0 0' * (4 + TIME_DECIMALS), "gfx/hud/sb_highlight_4", '0 28 0' + '32 0 0' * (4 + TIME_DECIMALS), '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+
+               HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0', racemsec, -TIME_DECIMALS, 0, 30, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+               HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0'  - '66 0 0', racesec, -2, 0, 30, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+               drawpic(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '18 0 0', "gfx/hud/num_dot", '30 30 0', '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE);
+
+               HUD_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '132 0 0', racemin, -2, 0, 30, '1 1 1', 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+               drawpic(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '84 0 0', "gfx/hud/num_colon", '30 30 0', '1 1 1', hud_alpha_fg, DRAWFLAG_ADDITIVE);
+       }
+}*/
+
+// Keyhunt HUD modicon section
+float kh_runheretime;
+
+void CSQC_kh_hudreset(void)
+{
+       kh_runheretime = 0;
+}
+
+void CSQC_kh_hud(void)
+{
+       float kh_keys;
+       float keyteam;
+       float a, aa;
+       vector p, pa, kh_size, kh_asize;
+
+       p_x = 6;
+       p_y = vid_conheight - 34 - 3;
+       p_z = 0;
+
+       kh_keys = getstati(STAT_KH_KEYS);
+
+       kh_size = '19 34 0';
+       kh_asize = '19 10 0';
+       pa = p + '0 -10 0';
+
+       float i, key;
+
+       float keycount;
+       keycount = 0;
+       for(i = 0; i < 4; ++i)
+       {
+               key = floor(kh_keys / pow(32, i)) & 31;
+               keyteam = key - 1;
+               if(keyteam == 30 && keycount <= 4)
+                       keycount += 4;
+               if(keyteam == myteam || keyteam == -1 || keyteam == 30)
+                       keycount += 1;
+       }
+       // this yields 8 exactly if "RUN HERE" shows
+
+       if(keycount == 8)
+       {
+               if(!kh_runheretime)
+                       kh_runheretime = time;
+               pa_y -= fabs(sin((time - kh_runheretime) * 3.5)) * 6; // make the arrows jump in case of RUN HERE
+       }
+       else
+               kh_runheretime = 0;
+
+       for(i = 0; i < 4; ++i)
+       {
+               key = floor(kh_keys / pow(32, i)) & 31;
+               keyteam = key - 1;
+               switch(keyteam)
+               {
+                       case 30: // my key
+                               keyteam = myteam;
+                               a = 1;
+                               aa = 1;
+                               break;
+                       case -1: // no key
+                               a = 0;
+                               aa = 0;
+                               break;
+                       default: // owned or dropped
+                               a = 0.2;
+                               aa = 0.5;
+                               break;
+               }
+               a = a * hud_alpha_fg;
+               aa = aa * hud_alpha_fg;
+               if(a > 0)
+               {
+                       switch(keyteam)
+                       {
+                               case COLOR_TEAM1:
+                                       drawpic (pa, "gfx/hud/sb_kh_redarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
+                                       break;
+                               case COLOR_TEAM2:
+                                       drawpic (pa, "gfx/hud/sb_kh_bluearrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
+                                       break;
+                               case COLOR_TEAM3:
+                                       drawpic (pa, "gfx/hud/sb_kh_yellowarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
+                                       break;
+                               case COLOR_TEAM4:
+                                       drawpic (pa, "gfx/hud/sb_kh_pinkarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
+                                       break;
+                               default:
+                                       break;
+                       }
+                       switch(i) // YAY! switch(i) inside a for loop for i. DailyWTF, here we come!
+                       {
+                               case 0:
+                                       drawpic (p, "gfx/hud/sb_kh_red", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
+                                       break;
+                               case 1:
+                                       drawpic (p, "gfx/hud/sb_kh_blue", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
+                                       break;
+                               case 2:
+                                       drawpic (p, "gfx/hud/sb_kh_yellow", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
+                                       break;
+                               case 3:
+                                       drawpic (p, "gfx/hud/sb_kh_pink", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
+                                       break;
+                       }
+               }
+               p_x += 24;
+               pa_x += 24;
+       }
+}
+
+// Nexball HUD modicon section
+#define NBPB_SIZE '96 38 0'
+#define NBPB_BT 2                   //thickness
+#define NBPB_BRGB '1 1 1'
+#define NBPB_BALPH 1                //alpha
+#define NBPB_BFLAG DRAWFLAG_NORMAL
+#define NBPB_IALPH 0.4
+#define NBPB_IFLAG DRAWFLAG_NORMAL
+#define NBPB_IRGB '0.7 0.1 0'
+
+void CSQC_nb_hud(void)
+{
+       float stat_items, nb_pb_starttime, dt, p;
+       vector pos;
+
+       stat_items = getstati(STAT_ITEMS);
+       nb_pb_starttime = getstatf(STAT_NB_METERSTART);
+
+       pos_x = 4;
+       pos_y = vid_conheight - 42;
+       pos_z = 0;
+
+       //Manage the progress bar if any
+       if (nb_pb_starttime > 0)
+       {
+               vector s;
+               dt = mod(time - nb_pb_starttime, nb_pb_period);
+               // one period of positive triangle
+               p = 2 * dt / nb_pb_period;
+               if (p > 1)
+                       p = 2 - p;
+
+               s = NBPB_SIZE;
+               //Draw the filling
+               drawfill(pos, p * s_x * eX + s_y * eY, NBPB_IRGB, NBPB_IALPH, NBPB_IFLAG);
+
+               //Draw the box
+               s = NBPB_SIZE;
+               drawline(NBPB_BT, pos    , pos + eX * s_x, NBPB_BRGB, NBPB_BALPH, NBPB_BFLAG);
+               drawline(NBPB_BT, pos    , pos + eY * s_y, NBPB_BRGB, NBPB_BALPH, NBPB_BFLAG);
+               drawline(NBPB_BT, pos + s, pos + eX * s_x, NBPB_BRGB, NBPB_BALPH, NBPB_BFLAG);
+               drawline(NBPB_BT, pos + s, pos + eY * s_y, NBPB_BRGB, NBPB_BALPH, NBPB_BFLAG);
+       }
+
+       pos_x += 12; //horizontal margin to the picture
+       pos_y += 2; //vertical margin to the picture
+
+       if (stat_items & IT_KEY1)
+               drawpic(pos, "gfx/hud/sb_nexball_carrying", '80 34 0', '1 1 1', 1, DRAWFLAG_NORMAL);
+}
+
+// Race/CTS HUD modicon section
+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
+void CSQC_race_hud(void)
+{
+       entity me;
+       me = playerslots[player_localentnum - 1];
+       float t, score;
+       float f; // yet another function has this
+       score = me.(scores[ps_primary]);
+
+       if not((scores_flags[ps_primary] & SFL_TIME) && !teamplay) // race/cts record display on HUD
+               return; // no records in the actual race
+
+       drawfont = sbar_bigfont;
+       vector pos;
+       pos_x = 2;
+       pos_y = vid_conheight - 48;
+
+       // clientside personal record
+       string rr;
+       if(gametype == GAME_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(t != crecordtime_prev) {
+               crecordtime_prev = t;
+               crecordtime_change_time = time;
+       }
+       f = time - crecordtime_change_time;
+
+       if (f > 1) {
+               drawstring(pos, "Personal best ", '10 10 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+               drawstring(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+       } else {
+               drawstring(pos, "Personal best ", '10 10 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+               drawstring(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+               drawstring_expanding(pos, "Personal best ", '10 10 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL, f);
+               drawstring_expanding(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL, f);
+       }
+
+       // server record
+       pos_y += 26;
+       t = race_server_record;
+       if(t != srecordtime_prev) {
+               srecordtime_prev = t;
+               srecordtime_change_time = time;
+       }
+       f = time - srecordtime_change_time;
+
+       if (f > 1) {
+               drawstring(pos, "Server best ", '10 10 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+               drawstring(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+       } else {
+               drawstring(pos, "Server best ", '10 10 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+               drawstring(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+               drawstring_expanding(pos, "Server best ", '10 10 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL, f);
+               drawstring_expanding(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL, f);
+       }
+       drawfont = sbar_font;
+}
+
+// Timer (#5)
+//
+void HUD_Timer()
+{
+       float marigin;
+
+       vector pos, mySize, color;
+       marigin = HUD_Panel_GetMarigin(5);
+       pos = HUD_Panel_GetPos(5);
+       mySize = HUD_Panel_GetSize(5);
+       color = HUD_Panel_GetColor(5);
+
+       if(HUD_Panel_GetBgActive(5))
+               draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+
+       float timelimit, elapsedTime, minutes, seconds, timeleft, minutesLeft, secondsLeft;
+
+       timelimit = getstatf(STAT_TIMELIMIT);
+
+       HUD_DrawRaceStatus(pos + '0 30 0');
+
+       timeleft = max(0, timelimit * 60 + getstatf(STAT_GAMESTARTTIME) - time);
+       timeleft = ceil(timeleft);
+       minutesLeft = floor(timeleft / 60);
+       secondsLeft = timeleft - minutesLeft*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 (cvar("hud_increment_maptime") || timelimit == 0 || warmup_stage) {
+               if (time < getstatf(STAT_GAMESTARTTIME)) {
+                       //while restart is still active, show 00:00
+                       minutes = seconds = 0;
+               } else {
+                       elapsedTime = floor(time - getstatf(STAT_GAMESTARTTIME)); //127
+                       minutes = floor(elapsedTime / 60);
+                       seconds = elapsedTime - minutes*60;
+               }
+       } else {
+               minutes = minutesLeft;
+               seconds = secondsLeft;
+       }
+
+       if(minutesLeft >= 1 || cvar("hud_increment_maptime") || timelimit == 0 || warmup_stage) {
+               HUD_DrawXNum(pos, minutes, 3, 0, mySize_y, timer_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+               drawpic(pos + eX * 0.5 * mySize_x, "gfx/hud/num_colon", eX * mySize_y + eY * mySize_y, timer_color, hud_alpha_fg, DRAWFLAG_NORMAL);
+       }
+       HUD_DrawXNum(pos + eX * 0.6 * mySize_x, seconds, -2, 0, mySize_y, timer_color, 0, 0, hud_alpha_fg, DRAWFLAG_NORMAL);
+}
+
+// Radar (#6)
+//
+
+void() teamradar_view =
+{
+       float marigin;
+
+       vector pos, mySize, color;
+       marigin = HUD_Panel_GetMarigin(6);
+       pos = HUD_Panel_GetPos(6);
+       mySize = HUD_Panel_GetSize(6);
+       color = HUD_Panel_GetColor(6);
+
+       if(HUD_Panel_GetBgActive(6))
+               draw_BorderPicture(pos - '1 1 0' * marigin, "gfx/hud/border", mySize + '1 1 0' * 2 * marigin, color, hud_alpha_bg, '1 1 0' * (marigin/MARIGIN_MULTIPLIER));
+
+       local float color1, color2; // color already declared as a global in sbar.qc
+       local vector rgb;
+       local entity tm;
+       float scale2d, normalsize, bigsize;
+       float f;
+
+       teamradar_origin2d = pos + 0.5 * mySize; // TODO: stupid compat, should be removed
+       teamradar_size2d = mySize;
+
+       if(minimapname == "" && !ons_showmap)
+               return;
+
+       teamradar_loadcvars();
+
+       switch(cl_teamradar_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(cl_teamradar_rotation)
+       {
+               case 0:
+                       teamradar_angle = view_angles_y - 90;
+                       break;
+               default:
+                       teamradar_angle = 90 * cl_teamradar_rotation;
+                       break;
+       }
+
+       scale2d = vlen_maxnorm2d(mi_picmax - mi_picmin);
+       teamradar_size2d = mySize;
+
+       teamradar_extraclip_mins = teamradar_extraclip_maxs = '0 0 0';
+       if(pos == eX * vid_conwidth)
+       {
+               if(cl_teamradar_nohudhack < 2)
+                       pos_y += 25;
+               if(cl_teamradar_nohudhack < 1)
+                       teamradar_extraclip_mins_y -= 25;
+       }
+       else if(pos == eY * vid_conheight || pos == eX * vid_conwidth + eY * vid_conheight)
+       {
+               if(cl_teamradar_nohudhack < 2)
+                       pos_y -= 50;
+               //if(cl_teamradar_nohudhack < 1)
+                       //teamradar_extraclip_size_y += 50; // don't, the HUD looks nice
+       }
+
+       // pixels per world qu to match the teamradar_size2d_x range in the longest dimension
+       if(cl_teamradar_rotation == 0)
+       {
+               // max-min distance must fit the radar in any rotation
+               bigsize = vlen_minnorm2d(teamradar_size2d) * scale2d / (1.05 * vlen2d(mi_max - mi_min));
+       }
+       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 = max4(c0_x, c1_x, c2_x, c3_x) - min4(c0_x, c1_x, c2_x, c3_x);
+               span_y = max4(c0_y, c1_y, c2_y, c3_y) - min4(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 / cl_teamradar_scale;
+       if(bigsize > normalsize)
+               normalsize = bigsize;
+
+       teamradar_size =
+                 f * bigsize
+               + (1 - f) * normalsize;
+       teamradar_origin3d_in_texcoord = teamradar_3dcoord_to_texcoord(
+                 f * (mi_min + mi_max) * 0.5
+               + (1 - f) * view_origin);
+
+       color1 = GetPlayerColor(player_localentnum-1);
+       rgb = GetTeamRGB(color1);
+
+       drawsetcliparea(
+               pos_x,
+               pos_y,
+               pos_x + mySize_x,
+               pos_y + mySize_y
+       );
+
+       draw_teamradar_background(cl_teamradar_background_alpha, cl_teamradar_foreground_alpha);
+
+       if(ons_showmap)
+       {
+               drawresetcliparea();
+
+               vector frame_origin, frame_size;
+               frame_origin = frame_size = '0 0 0';
+
+               frame_origin_x = pos_x - teamradar_size2d_x * 0.55859375; // matches the picture
+               frame_origin_y = pos_y - teamradar_size2d_y * 0.55859375; // matches the picture
+               frame_size_x = pos_x * 1.1171875; // matches the picture
+               frame_size_y = pos_y * 1.1171875; // matches the picture
+               drawpic(frame_origin, "gfx/ons-frame.tga", frame_size, '1 1 1', hud_alpha_fg, 0);
+               drawpic(frame_origin, "gfx/ons-frame-team.tga", frame_size, rgb, hud_alpha_fg, 0);
+
+               drawsetcliparea(
+                       pos_x - teamradar_size2d_x * 0.5,
+                       pos_y - teamradar_size2d_y * 0.5,
+                       teamradar_size2d_x,
+                       teamradar_size2d_y
+               );
+       }
+
+       for(tm = world; (tm = find(tm, classname, "radarlink")); )
+               draw_teamradar_link(tm.origin, tm.velocity, tm.team);
+       for(tm = world; (tm = findflags(tm, teamradar_icon, 0xFFFFFF)); )
+               draw_teamradar_icon(tm.origin, tm.teamradar_icon, tm, tm.teamradar_color, hud_alpha_fg);
+       for(tm = world; (tm = find(tm, classname, "entcs_receiver")); )
+       {
+               color2 = GetPlayerColor(tm.sv_entnum);
+               //if(color == COLOR_SPECTATOR || color == color2)
+                       draw_teamradar_player(tm.origin, tm.angles, GetTeamRGB(color2));
+       }
+       draw_teamradar_player(view_origin, view_angles, '1 1 1');
+
+       drawresetcliparea();
+};
+
+/*
+==================
+Main HUD system
+==================
+*/
+
+void HUD_DrawPressedKeys(void)
+{
+       vector pos, bgsize;
+       float pressedkeys;
+
+       pos = stov(cvar_string("cl_showpressedkeys_position"));
+
+       bgsize = '126 75 0';
+
+       pos = eX * (vid_conwidth - bgsize_x) * pos_x
+           + eY * (vid_conheight - bgsize_y) * pos_y;
+       pos -= '-15 -6 0'; // adjust to the origin of these numbers
+
+       pressedkeys = getstatf(STAT_PRESSED_KEYS);
+       drawpic(pos + '-15   -6   0', "gfx/hud/keys/key_bg.tga",           bgsize, '1 1 1', 0.1 * hud_alpha_fg, DRAWFLAG_NORMAL);
+       drawpic(pos + ' 83.5  9   0', ((pressedkeys & KEY_CROUCH) ? "gfx/hud/keys/key_crouch_inv.tga" : "gfx/hud/keys/key_crouch.tga"), ' 24 24 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+       drawpic(pos + ' 32   -1.5 0', ((pressedkeys & KEY_FORWARD) ? "gfx/hud/keys/key_forward_inv.tga" : "gfx/hud/keys/key_forward.tga"),  ' 32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+       drawpic(pos + '-11.5  9   0', ((pressedkeys & KEY_JUMP) ? "gfx/hud/keys/key_jump_inv.tga" : "gfx/hud/keys/key_jump.tga"),     ' 24 24 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+       drawpic(pos + ' -1   32   0', ((pressedkeys & KEY_LEFT) ? "gfx/hud/keys/key_left_inv.tga" : "gfx/hud/keys/key_left.tga"),     ' 32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+       drawpic(pos + ' 32   32   0', ((pressedkeys & KEY_BACKWARD) ? "gfx/hud/keys/key_backward_inv.tga" : "gfx/hud/keys/key_backward.tga"), ' 32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+       drawpic(pos + ' 65   32   0', ((pressedkeys & KEY_RIGHT) ? "gfx/hud/keys/key_right_inv.tga" : "gfx/hud/keys/key_right.tga"),    ' 32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+}
+
+void HUD_ShowSpeed(void)
+{
+       vector numsize;
+       float pos, conversion_factor;
+       string speed, zspeed, unit;
+
+       switch(cvar("cl_showspeed_unit"))
+       {
+               default:
+               case 0:
+                       unit = "";
+                       conversion_factor = 1.0;
+                       break;
+               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;
+       }
+
+       speed = strcat(ftos(floor( vlen(pmove_vel - pmove_vel_z * '0 0 1') * conversion_factor + 0.5 )), unit);
+
+       numsize_x = numsize_y = cvar("cl_showspeed_size");
+       pos = (vid_conheight - numsize_y) * cvar("cl_showspeed_position");
+
+       drawfont = sbar_bigfont;
+       drawstringcenter(eX + pos * eY, speed, numsize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+
+       if (cvar("cl_showspeed_z") == 1) {
+               zspeed = strcat(ftos(fabs(floor( pmove_vel_z * conversion_factor + 0.5 ))), unit);
+               drawstringcenter(eX + pos * eY + numsize_y * eY, zspeed, numsize * 0.5, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+       }
+
+       drawfont = sbar_font;
+}
+
+vector acc_prevspeed;
+float acc_prevtime;
+float acc_avg;
+
+void HUD_ShowAcceleration(void)
+{
+       float acceleration, sz, scale, alpha, f;
+       vector pos, top, rgb;
+       top_x = vid_conwidth/2;
+       top_y = 0;
+
+       f = time - acc_prevtime;
+       if(cvar("cl_showacceleration_z"))
+               acceleration = (vlen(pmove_vel) - vlen(acc_prevspeed)) * (1 / f);
+       else
+               acceleration = (vlen(pmove_vel - '0 0 1' * pmove_vel_z) - vlen(acc_prevspeed - '0 0 1' * acc_prevspeed_z)) * (1 / f);
+       acc_prevspeed = pmove_vel;
+       acc_prevtime = time;
+
+       f = bound(0, f * 10, 1);
+       acc_avg = acc_avg * (1 - f) + acceleration * f;
+       acceleration = acc_avg / getstatf(STAT_MOVEVARS_MAXSPEED);
+
+       pos = top - sz/2 * eY + (cvar("cl_showacceleration_position") * vid_conheight) * eY;
+
+       sz = cvar("cl_showacceleration_size");
+       scale = cvar("cl_showacceleration_scale");
+       alpha = cvar("cl_showacceleration_alpha");
+       if (cvar("cl_showacceleration_color_custom"))
+               rgb = stov(cvar_string("cl_showacceleration_color"));
+       else {
+               rgb = '1 1 1';
+               if (acceleration < 0) {
+                       rgb = '1 .5 .5' - '0 .5 .5' * bound(0, -acceleration * 0.2, 1);
+               } else if (acceleration > 0) {
+                       rgb = '.5 1 .5' - '.5 0 .5' * bound(0, +acceleration * 0.2, 1);
+               }
+       }
+
+       if (acceleration > 0)
+               drawpic(pos, "gfx/hud/accelerometer_gradient", acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+       else if (acceleration < 0)
+               drawpic(pos + acceleration * scale * '40 0 0', "gfx/hud/accelerometer_gradient", -acceleration * scale * '40 0 0' + sz * eY, rgb, alpha * hud_alpha_fg, DRAWFLAG_NORMAL);
+}
+
+void HUD_Reset (void)
+{
+       // reset gametype specific icons
+       if(gametype == GAME_KEYHUNT)
+               CSQC_kh_hudreset();
+       else if(gametype == GAME_CTF)
+               CSQC_ctf_hudreset();
+}
+
+void HUD_Main (void)
+{
+       hud_alpha_bg = cvar_or("hud_alpha_bg", 0.8) * (1 - cvar("_menu_alpha"));
+       hud_border_thickness = bound(0, cvar("hud_border_thickness"), 5);
+       hud_accuracy_border_thickness = bound(0, cvar_or("hud_accuracy_border_thickness", 1), 5);
+       hud_color_bg_team = cvar("hud_color_bg_team");
+
+       sbar_fontsize = Sbar_GetFontsize("sbar_fontsize");
+       sbar_fontsize_spec = Sbar_GetFontsize("sbar_fontsize_spec");
+
+       if(cvar_or("hud_inventory", 1))
+               HUD_Inventory();
+       if(cvar_or("hud_weaponicons", 1))
+               HUD_WeaponIcons();
+       if(cvar_or("hud_timer", 1))
+               HUD_Timer();
+       if(cvar_or("hud_powerups", 1))
+               HUD_Powerups();
+       if(cvar_or("hud_health", 1))
+               HUD_HealthArmor();
+       if(cvar_or("hud_notify", 1))
+               HUD_Score();
+       if((gametype == GAME_RACE || gametype == GAME_CTS) && cvar_or("hud_racetimer", 1))
+               HUD_RaceTimer();
+       if(cvar("hud_pressedkeys"))
+               HUD_DrawPressedKeys();
+       if(cvar("hud_speed"))
+               HUD_ShowSpeed();
+       if(cvar("hud_acceleration"))
+               HUD_ShowAcceleration();
+
+       //Sbar_UpdatePlayerTeams();
+       // move this stuff to View.qc
+       if (intermission == 2) // map voting screen
+       {
+               if(sb_showaccuracy && spectatee_status != -1) {
+                       //HUD_DrawAccuracyStats();
+                       //HUD_Score();
+                       //HUD_Timer();
+               }
+               else if(sb_showscores) {
+                       //HUD_DrawScoreboard();
+                        //HUD_Score();
+                        //HUD_Timer();
+                }
+               else
+                       //HUD_FinaleOverlay();
+
+               HUD_Reset();
+       }
+       else if (sb_showscores_force || getstati(STAT_HEALTH) <= 0 || intermission == 1)
+       {
+               //if(sb_showaccuracy && spectatee_status != -1)
+                       //HUD_DrawAccuracyStats();
+               //else
+                       //HUD_DrawScoreboard();
+               //HUD_Score();
+               //HUD_Timer();
+
+               //HUD_Reset();
+       }
+       else
+       {
+               //if(sb_showaccuracy && spectatee_status != -1)
+                       //HUD_DrawAccuracyStats();
+               //else
+               //      HUD_DrawScoreboard();
+
+               // draw scores and timer
+               //HUD_Score();
+               //HUD_Timer();
+
+               // draw gametype specific icons
+               if(gametype == GAME_KEYHUNT)
+                       CSQC_kh_hud();
+               else if(gametype == GAME_CTF)
+                       CSQC_ctf_hud();
+               else if(gametype == GAME_NEXBALL)
+                       CSQC_nb_hud();
+               else if(gametype == GAME_CTS || gametype == GAME_RACE)
+                       CSQC_race_hud();
+       }
+       return;
+}
diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh
new file mode 100644 (file)
index 0000000..91edd4a
--- /dev/null
@@ -0,0 +1,26 @@
+void CSQC_kh_hudreset();
+void CSQC_kh_hud();
+void CSQC_ctf_hudreset();
+void CSQC_ctf_hud();
+void CSQC_nb_hud();
+void CSQC_race_hud();
+const float MARIGIN_MULTIPLIER = 0.25;
+float hud_color_bg_team;
+float scoreboard_bottom;
+float weapon_hits[WEP_MAXCOUNT];
+float weapon_fired[WEP_MAXCOUNT];
+float weapon_number;
+
+float ps_primary, ps_secondary;
+float ts_primary, ts_secondary;
+
+float last_weapon;
+float weapontime;
+
+float teamnagger;
+float hud_alpha_fg;
+float hud_alpha_bg;
+float hud_hudselector;
+float hud_accuracy_hud;
+float hud_border_thickness;
+float hud_accuracy_border_thickness;
index b7a3d59..83da2d2 100644 (file)
@@ -96,7 +96,6 @@ float teamscores_flags[MAX_SCORE];
 
 
 vector sbar_fontsize;
-vector sbar_oldfontsize;
 vector sbar_fontsize_spec;
 
 float RANKINGS_RECEIVED_CNT;
index 17036a9..2dcd552 100644 (file)
@@ -71,8 +71,8 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin
        pos_x = pos_x + text_size*0.5 - img_size_x*0.5;
        pos_y = pos_y - img_size_y;
 
-       pos += sbar_border_thickness * '1 1 0';
-       img_size -= (sbar_border_thickness * 2) * '1 1 0';
+       pos += hud_border_thickness * '1 1 0';
+       img_size -= (hud_border_thickness * 2) * '1 1 0';
        if(pic == "")
        {
                drawfill(pos, img_size, '.5 .5 .5', .7, DRAWFLAG_NORMAL);
@@ -86,12 +86,12 @@ void MapVote_DrawMapItem(vector pos, float isize, float tsize, string map, strin
 
        if(id == mv_ownvote || pic == "")
        {
-               drawborderlines(sbar_border_thickness, pos, img_size, rgb, 1, DRAWFLAG_NORMAL);
+               drawborderlines(hud_border_thickness, pos, img_size, rgb, 1, DRAWFLAG_NORMAL);
                drawpic(pos + '1 0 0', strcat("gfx/hud/num_", ftos(id+1)), (img_size_y / 5) * '1 1 0', rgb, 0.6, DRAWFLAG_NORMAL);
        }
        else
        {
-               drawborderlines(sbar_border_thickness, pos, img_size, '0 0 0', 1, DRAWFLAG_NORMAL);
+               drawborderlines(hud_border_thickness, pos, img_size, '0 0 0', 1, DRAWFLAG_NORMAL);
                drawpic(pos + '1 0 0', strcat("gfx/hud/num_", ftos(id+1)), (img_size_y / 5) * '1 1 0', '1 1 1', 0.6, DRAWFLAG_NORMAL);
        }
 }
@@ -249,7 +249,7 @@ void MapVote_Draw()
                MapVote_DrawAbstain(pos, isize, xmax - xmin, tmp, i);
        }
 
-       drawpic(mv_mousepos, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor.tga"), '32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+       drawpic(mv_mousepos, strcat("gfx/menu/", cvar_string("menu_skin"), "/cursor.tga"), '32 32 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
 }
 
 void Cmd_MapVote_MapDownload(float argc)
index 15f230d..9fc7ed3 100644 (file)
@@ -21,6 +21,7 @@ autocvars.qh
 
 interpolate.qh
 teamradar.qh
+hud.qh
 waypointsprites.qh
 movetypes.qh
 prandom.qh
@@ -34,7 +35,9 @@ teamplay.qc
 
 ctf.qc
 
-sbar.qc
+teamradar.qc
+hud.qc
+scoreboard.qc
 mapvoting.qc
 
 rubble.qc
@@ -54,7 +57,6 @@ tuba.qc
 Main.qc
 View.qc
 interpolate.qc
-teamradar.qc
 waypointsprites.qc
 movetypes.qc
 prandom.qc
diff --git a/qcsrc/client/sbar.qc b/qcsrc/client/sbar.qc
deleted file mode 100644 (file)
index 2b06979..0000000
+++ /dev/null
@@ -1,3436 +0,0 @@
-void drawstringright(vector, string, vector, vector, float, float);
-void drawstringcenter(vector, string, vector, vector, float, float);
-
-float teamnagger;
-
-float weapon_hits[WEP_MAXCOUNT];
-float weapon_fired[WEP_MAXCOUNT];
-float weapon_number;
-
-float last_weapon;
-float weapontime;
-
-float sbar_alpha_fg;
-float sbar_alpha_bg;
-float sbar_color_bg_team;
-float sbar_border_thickness;
-float sbar_accuracy_border_thickness;
-float sbar_scoreboard_alpha_bg;
-float sbar_scoreboard_alpha_fg;
-float sbar_scoreboard_highlight;
-float sbar_scoreboard_highlight_alpha;
-float sbar_scoreboard_highlight_alpha_self;
-float sbar_hudselector;
-float sbar_accuracy_hud;
-float sbar_scoreboard_alpha_name;
-float sbar_scoreboard_alpha_name_self;
-
-float ps_primary, ps_secondary;
-float ts_primary, ts_secondary;
-
-vector color;
-float SCOREBOARD_OFFSET = 50;
-
-void CSQC_kh_hudreset();
-void CSQC_kh_hud();
-void CSQC_ctf_hudreset();
-void CSQC_ctf_hud();
-void CSQC_nb_hud();
-void CSQC_race_hud();
-void MapVote_Draw();
-void Sbar_FinaleOverlay()
-{
-       /*vector pos;
-       pos_x = (vid_conwidth - 1)/2;
-       pos_y = 16;
-       pos_z = 0;*/
-
-       //drawpic(pos, "gfx/finale", '0 0 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-       //drawstring(pos, "END", sbar_fontsize, '1 1 1', 1, DRAWFLAG_NORMAL);
-       MapVote_Draw();
-}
-
-vector Sbar_AccuracyColor(float accuracy)
-{
-       vector rgb;
-       float yellow_accuracy = cvar("sbar_accuracy_yellow"); // value at which this function returns yellow
-       if(accuracy >= 100) {
-               rgb_x = 0;
-               rgb_y = 1;
-       }
-       else if(accuracy > yellow_accuracy) {
-               rgb_x = 1 - (accuracy-yellow_accuracy)/(100-yellow_accuracy); // red value between 1 -> 0
-               rgb_y = 1;
-       }
-       else {
-               rgb_x = 1;
-               rgb_y = accuracy/yellow_accuracy; // green value between 0 -> 1
-       }
-       rgb_z = 0;
-       return rgb;
-}
-
-float weaponspace[10];
-void Sbar_DrawWeapon_Clear()
-{
-       float idx;
-       for(idx = 0; idx < 10; ++idx)
-               weaponspace[idx] = 0;
-}
-void Sbar_DrawWeapon(entity wi, float fade, float active)
-{
-       vector pos, vsize, fill_colour;
-       float value, idx, imp, sp, weapon_hit, weapon_damage, weapon_stats;
-
-       imp = wi.impulse;
-
-       weapon_hit = weapon_hits[wi.weapon-WEP_FIRST];
-       weapon_damage = weapon_fired[wi.weapon-WEP_FIRST];
-       if(imp == 0)
-               idx = 9;
-       else
-               idx = imp - 1;
-
-       value = (active) ? 1 : 0.6;
-       color_x = color_y = color_z = value;
-
-       // width = 300, height = 100
-       const float w_width = 24, w_height = 12, w_space = 2, font_size = 8, accuracybar_height = 3;
-
-       sp = weaponspace[idx] + 1;
-       weaponspace[idx] = sp;
-
-       pos_x = (vid_conwidth + 6 - w_width * 9) * 0.5 + w_width * idx;
-       pos_y = (vid_conheight - w_height * sp) - 38; // move 38 pixels up
-       pos_z = 0;
-       vsize_x = w_width;
-       vsize_y = w_height;
-       vsize_z = 0;
-       if (active)
-               drawpic(pos, "gfx/hud/sb_ammobg", vsize, color, value * fade * sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos, strcat("gfx/hud/inv_weapon", wi.netname), vsize, color, value * fade * sbar_alpha_fg, DRAWFLAG_NORMAL);
-       pos_x += w_space;
-       pos_y += w_space;
-       vsize_x = font_size;
-       vsize_y = font_size;
-       vsize_z = 0;
-       drawstring(pos, ftos(imp), vsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-       // draw the weapon accuracy on the HUD
-       if(sbar_accuracy_hud && !(gametype == GAME_RACE || gametype == GAME_CTS))
-       {
-               if(weapon_damage)
-                       weapon_stats = floor(100 * weapon_hit / weapon_damage);
-
-               fill_colour = Sbar_AccuracyColor(weapon_stats);
-               if(weapon_damage)
-                       drawpic(pos - '2 0 0' + '0 1 0' * (w_height - accuracybar_height), "gfx/hud/sb_accuracy_bar.tga", '1 0 0' * w_width + '0 1 0' * accuracybar_height, fill_colour, sbar_alpha_fg, DRAWFLAG_NORMAL);
-       }
-}
-
-void Sbar_DrawXNum (vector pos, float num, float digits, float showminusplus, float lettersize, vector rgb, float highlighted, float stroke, float alpha, float dflags)
-{
-       float l, i;
-       string str, tmp, l_length;
-       float minus, plus;
-       vector vsize, num_color;
-
-       vsize_x = vsize_y = lettersize;
-       vsize_z = 0;
-
-       // showminusplus 1: always prefix with minus sign (useful in race distribution display)
-       // showminusplus 2: always prefix with plus sign (useful in race distribution display)
-       // showminusplus 3: prefix with minus sign if negative, plus sign if positive (useful in score distribution display)
-
-       if((showminusplus == 2 && num >= 0) || (num > 0 && showminusplus == 3))
-       {
-               plus = true;
-               pos_x -= lettersize;
-       } else
-               plus = false;   
-
-       if(num < 0 || (num < 0 && showminusplus == 3) || (showminusplus == 1 && num <= 0))
-       {
-               minus = true;
-               num = -num;
-               pos_x -= lettersize;
-       } else
-               minus = false;
-
-       if(digits < 0)
-       {
-               tmp = ftos(num);
-               digits = -digits;
-               str = strcat(substring("0000000000", 0, digits - strlen(tmp)), tmp);
-       } else
-               str = ftos(num);
-
-       l = strlen(str);
-       l_length = ftos(l);
-
-       if(l > digits)
-       {
-               str = substring(str, l-digits, 999);
-               l = strlen(str);
-       } else if(l < digits)
-               pos_x += (digits-l) * lettersize;
-
-       if (highlighted == 1) {
-               vector hl_size;
-               hl_size_x = vsize_x * l + vsize_x * 0.2;
-               hl_size_y = vsize_y * 1.1;
-               hl_size_z = 0;
-               if(minus)
-                       hl_size_x = hl_size_x + vsize_x;
-
-               vector hl_pos;
-               hl_pos_x = pos_x - lettersize/10;
-               hl_pos_y = pos_y - lettersize/20;
-               hl_pos_z = 0;
-
-               drawpic(hl_pos, strcat("gfx/hud/sb_highlight_", l_length), hl_size, '1 1 1', alpha, dflags);
-       }
-
-       if (stroke == 1)
-               num_color = '1 1 1';
-       else
-               num_color = rgb;
-
-       if(minus)
-       {
-               if (stroke == 1)
-                       drawpic(pos, "gfx/hud/num_minus_stroke", vsize, rgb, alpha, dflags);
-               drawpic(pos, "gfx/hud/num_minus", vsize, num_color, alpha, dflags);
-               pos_x += lettersize;
-       } else if(plus)
-       {
-               if (stroke == 1)
-                       drawpic(pos, "gfx/hud/num_plus_stroke", vsize, rgb, alpha, dflags);
-               drawpic(pos, "gfx/hud/num_plus", vsize, num_color, alpha, dflags);
-               pos_x += lettersize;
-       }
-
-       for(i = 0; i < l; ++i)
-       {
-               tmp = substring(str, i, 1);
-               if (stroke == 1)
-                       drawpic(pos, strcat("gfx/hud/num_", tmp, "_stroke"), vsize, rgb, alpha, dflags);
-               drawpic(pos, strcat("gfx/hud/num_", tmp), vsize, num_color, alpha, dflags);
-               pos_x += lettersize;
-       }
-}
-
-void Sbar_DrawXNum_Colored (vector pos, float x, float lettersize, float alpha)
-{
-       if(x > 200) {
-               color_x = 0;
-               color_y = 1;
-               color_z = 0;
-       }
-       else if(x > 150) {
-               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 > 100) {
-               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 > 50) {
-               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 > 20) {
-               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;
-       }
-       Sbar_DrawXNum(pos, x, 3, 0, lettersize, color, 0, 0, alpha, DRAWFLAG_NORMAL);
-}
-
-void Cmd_Sbar_SetFields(float argc);
-void Sbar_InitScores()
-{
-       float i, f;
-
-       ps_primary = ps_secondary = ts_primary = ts_secondary = -1;
-       for(i = 0; i < MAX_SCORE; ++i)
-       {
-               f = (scores_flags[i] & SFL_SORT_PRIO_MASK);
-               if(f == SFL_SORT_PRIO_PRIMARY)
-                       ps_primary = i;
-               if(f == SFL_SORT_PRIO_SECONDARY)
-                       ps_secondary = i;
-       }
-       if(ps_secondary == -1)
-               ps_secondary = ps_primary;
-
-       for(i = 0; i < MAX_TEAMSCORE; ++i)
-       {
-               f = (teamscores_flags[i] & SFL_SORT_PRIO_MASK);
-               if(f == SFL_SORT_PRIO_PRIMARY)
-                       ts_primary = i;
-               if(f == SFL_SORT_PRIO_SECONDARY)
-                       ts_secondary = i;
-       }
-       if(ts_secondary == -1)
-               ts_secondary = ts_primary;
-
-       Cmd_Sbar_SetFields(0);
-}
-
-void Sbar_UpdatePlayerPos(entity pl);
-float SetTeam(entity pl, float Team);
-//float lastpnum;
-void Sbar_UpdatePlayerTeams()
-{
-       float Team;
-       entity pl, tmp;
-       float num;
-
-       num = 0;
-       for(pl = players.sort_next; pl; pl = pl.sort_next)
-       {
-               num += 1;
-               Team = GetPlayerColor(pl.sv_entnum);
-               if(SetTeam(pl, Team))
-               {
-                       tmp = pl.sort_prev;
-                       Sbar_UpdatePlayerPos(pl);
-                       if(tmp)
-                               pl = tmp;
-                       else
-                               pl = players.sort_next;
-               }
-       }
-       /*
-       if(num != lastpnum)
-               print(strcat("PNUM: ", ftos(num), "\n"));
-       lastpnum = num;
-       */
-}
-
-float Sbar_ComparePlayerScores(entity left, entity right)
-{
-       float vl, vr;
-       vl = GetPlayerColor(left.sv_entnum);
-       vr = GetPlayerColor(right.sv_entnum);
-
-       if(!left.gotscores)
-               vl = COLOR_SPECTATOR;
-       if(!right.gotscores)
-               vr = COLOR_SPECTATOR;
-
-       if(vl > vr)
-               return true;
-       if(vl < vr)
-               return false;
-
-       if(vl == COLOR_SPECTATOR)
-       {
-               // FIRST the one with scores (spectators), THEN the ones without (downloaders)
-               // no other sorting
-               if(!left.gotscores && right.gotscores)
-                       return true;
-               return false;
-       }
-
-       vl = left.scores[ps_primary];
-       vr = right.scores[ps_primary];
-       if(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)
-       {
-               if(vl == 0 && vr != 0)
-                       return 1;
-               if(vl != 0 && vr == 0)
-                       return 0;
-       }
-       if(vl > vr)
-               return IS_INCREASING(scores_flags[ps_primary]);
-       if(vl < vr)
-               return IS_DECREASING(scores_flags[ps_primary]);
-
-       vl = left.scores[ps_secondary];
-       vr = right.scores[ps_secondary];
-       if(scores_flags[ps_secondary] & SFL_ZERO_IS_WORST)
-       {
-               if(vl == 0 && vr != 0)
-                       return 1;
-               if(vl != 0 && vr == 0)
-                       return 0;
-       }
-       if(vl > vr)
-               return IS_INCREASING(scores_flags[ps_secondary]);
-       if(vl < vr)
-               return IS_DECREASING(scores_flags[ps_secondary]);
-
-       return false;
-}
-
-void Sbar_UpdatePlayerPos(entity player)
-{
-       for(other = player.sort_next; other && Sbar_ComparePlayerScores(player, other); other = player.sort_next)
-       {
-               SORT_SWAP(player, other);
-       }
-       for(other = player.sort_prev; other != players && Sbar_ComparePlayerScores(other, player); other = player.sort_prev)
-       {
-               SORT_SWAP(other, player);
-       }
-}
-
-float Sbar_CompareTeamScores(entity left, entity right)
-{
-       float vl, vr;
-
-       if(left.team == COLOR_SPECTATOR)
-               return 1;
-       if(right.team == COLOR_SPECTATOR)
-               return 0;
-
-       vl = left.teamscores[ts_primary];
-       vr = right.teamscores[ts_primary];
-       if(vl > vr)
-               return IS_INCREASING(teamscores_flags[ts_primary]);
-       if(vl < vr)
-               return IS_DECREASING(teamscores_flags[ts_primary]);
-
-       vl = left.teamscores[ts_secondary];
-       vr = right.teamscores[ts_secondary];
-       if(vl > vr)
-               return IS_INCREASING(teamscores_flags[ts_secondary]);
-       if(vl < vr)
-               return IS_DECREASING(teamscores_flags[ts_secondary]);
-
-       return false;
-}
-
-void Sbar_UpdateTeamPos(entity Team)
-{
-       for(other = Team.sort_next; other && Sbar_CompareTeamScores(Team, other); other = Team.sort_next)
-       {
-               SORT_SWAP(Team, other);
-       }
-       for(other = Team.sort_prev; other != teams && Sbar_CompareTeamScores(other, Team); other = Team.sort_prev)
-       {
-               SORT_SWAP(other, Team);
-       }
-}
-
-void Cmd_Sbar_Help(float argc)
-{
-       print("You can modify the scoreboard using the ^2sbar_columns_set command.\n");
-       print("^3|---------------------------------------------------------------|\n");
-       print("Usage:\n");
-       print("^2sbar_columns_set default\n");
-       print("^2sbar_columns_set ^7filed1 field2 ...\n");
-       print("The following field names are recognized (case insensitive):\n");
-       print("You can use a ^3|^7 to start the right-aligned fields.\n\n");
-
-       print("^3name^7 or ^3nick^7         Name of a player\n");
-       print("^3ping^7                     Ping time\n");
-       print("^3pl^7                       Packet loss\n");
-       print("^3kills^7                    Number of kills\n");
-       print("^3deaths^7                   Number of deaths\n");
-       print("^3suicides^7                 Number of suicides\n");
-       print("^3frags^7                    kills - suicides\n");
-       print("^3kd^7                       The kill-death ratio\n");
-       print("^3caps^7                     How often a flag (CTF) or a key (KeyHunt) was captured\n");
-       print("^3pickups^7                  How often a flag (CTF) or a key (KeyHunt) was picked up\n");
-       print("^3fckills^7                  Number of flag carrier kills\n");
-       print("^3returns^7                  Number of flag returns\n");
-       print("^3drops^7                    Number of flag drops\n");
-       print("^3lives^7                    Number of lives (LMS)\n");
-       print("^3rank^7                     Player rank\n");
-       print("^3pushes^7                   Number of players pushed into void\n");
-       print("^3destroyed^7                Number of keys destroyed by pushing them into void\n");
-       print("^3kckills^7                  Number of keys carrier kills\n");
-       print("^3losses^7                   Number of times a key was lost\n");
-       print("^3laps^7                     Number of laps finished (race/cts)\n");
-       print("^3time^7                     Total time raced (race/cts)\n");
-       print("^3fastest^7                  Time of fastest lap (race/cts)\n");
-       print("^3ticks^7                    Number of ticks (DOM)\n");
-       print("^3takes^7                    Number of domination points taken (DOM)\n");
-       print("^3score^7                    Total score\n\n");
-
-       print("Before a field you can put a + or - sign, then a comma separated list\n");
-       print("of game types, then a slash, to make the field show up only in these\n");
-       print("or in all but these game types. You can also specify 'all' as a\n");
-       print("field to show all fields available for the current game mode.\n\n");
-       
-       print("The special game type names 'teams' and 'noteams' can be used to\n");
-       print("include/exclude ALL teams/noteams game modes.\n\n");
-
-       print("Example: sbar_columns_set name ping pl | +ctf/field3 -dm/field4\n");
-       print("will display name, ping and pl aligned to the left, and the fields\n");
-       print("right of the vertical bar aligned to the right.\n");
-       print("'field3' will only be shown in CTF, and 'field4' will be shown in all\n");
-       print("other gamemodes except DM.\n");
-}
-
-string Sbar_DefaultColumnLayout()
-{
-       return strcat( // fteqcc sucks
-               "ping pl name | ",
-               "-teams,race,lms/kills -teams,lms/deaths -teams,lms,race/suicides -race,dm,tdm/frags ", // tdm already has this in "score"
-               "+ctf/caps +ctf/pickups +ctf/fckills +ctf/returns ",
-               "+lms/lives +lms/rank ",
-               "+kh/caps +kh/pushes +kh/destroyed ",
-               "?+race/laps ?+race/time ?+race/fastest ",
-               "+as/objectives +nexball/faults +nexball/goals ",
-               "-lms,race,nexball/score");
-}
-
-void Cmd_Sbar_SetFields(float argc)
-{
-       float i, j, slash;
-       string str, pattern;
-       float have_name, have_primary, have_secondary, have_separator;
-       float missing;
-
-       // TODO: re enable with gametype dependant cvars?
-       if(argc < 2) // no arguments provided
-               argc = tokenizebyseparator(strcat("x ", cvar_string("sbar_columns")), " ");
-
-       if(argc < 2)
-               argc = tokenizebyseparator(strcat("x ", Sbar_DefaultColumnLayout()), " ");
-
-       if(argc == 2)
-       {
-               if(argv(1) == "default")
-                       argc = tokenizebyseparator(strcat("x ", Sbar_DefaultColumnLayout()), " ");
-               else if(argv(1) == "all")
-               {
-                       string s;
-                       s = "ping pl color name |";
-                       for(i = 0; i < MAX_SCORE; ++i)
-                       {
-                               if(i != ps_primary)
-                               if(i != ps_secondary)
-                               if(scores_label[i] != "")
-                                       s = strcat(s, " ", scores_label[i]);
-                       }
-                       if(ps_secondary != ps_primary)
-                               s = strcat(s, " ", scores_label[ps_secondary]);
-                       s = strcat(s, " ", scores_label[ps_primary]);
-                       argc = tokenizebyseparator(strcat("x ", s), " ");
-               }
-       }
-
-
-       sbar_num_fields = 0;
-
-       drawfont = sbar_font;
-
-       for(i = 0; i < argc - 1; ++i)
-       {
-               float nocomplain;
-               str = argv(i+1);
-
-               nocomplain = FALSE;
-               if(substring(str, 0, 1) == "?")
-               {
-                       nocomplain = TRUE;
-                       str = substring(str, 1, strlen(str) - 1);
-               }
-
-               slash = strstrofs(str, "/", 0);
-               if(slash >= 0)
-               {
-                       pattern = substring(str, 0, slash);
-                       str = substring(str, slash + 1, strlen(str) - (slash + 1));
-
-                       if not(isGametypeInFilter(gametype, teamplay, pattern))
-                               continue;
-               }
-
-               strunzone(sbar_title[sbar_num_fields]);
-               sbar_title[sbar_num_fields] = strzone(str);
-               sbar_size[sbar_num_fields] = stringwidth(str, FALSE, sbar_fontsize);
-               str = strtolower(str);
-
-               if(str == "ping") {
-                       sbar_field[sbar_num_fields] = SP_PING;
-               } else if(str == "pl") {
-                       sbar_field[sbar_num_fields] = SP_PL;
-               } else if(str == "kd" || str == "kdr" || str == "kdratio" || str == "k/d") {
-                       sbar_field[sbar_num_fields] = SP_KDRATIO;
-               } else if(str == "name" || str == "nick") {
-                       sbar_field[sbar_num_fields] = SP_NAME;
-                       have_name = 1;
-               } else if(str == "|") {
-                       sbar_field[sbar_num_fields] = SP_SEPARATOR;
-                       have_separator = 1;
-               } else {
-                       for(j = 0; j < MAX_SCORE; ++j)
-                               if(str == strtolower(scores_label[j]))
-                                       goto found; // sorry, but otherwise fteqcc -O3 miscompiles this and warns about "unreachable code"
-:notfound
-                       if(str == "frags")
-                       {
-                               j = SP_FRAGS;
-                       }
-                       else
-                       {
-                               if not(nocomplain)
-                                       print(strcat("^1Error:^7 Unknown score field: '", str, "'\n"));
-                               continue;
-                       }
-:found
-                       sbar_field[sbar_num_fields] = j;
-                       if(j == ps_primary)
-                               have_primary = 1;
-                       if(j == ps_secondary)
-                               have_secondary = 1;
-               }
-               ++sbar_num_fields;
-               if(sbar_num_fields >= MAX_SBAR_FIELDS)
-                       break;
-       }
-
-       if(scores_flags[ps_primary] & SFL_ALLOW_HIDE)
-               have_primary = 1;
-       if(scores_flags[ps_secondary] & SFL_ALLOW_HIDE)
-               have_secondary = 1;
-       if(ps_primary == ps_secondary)
-               have_secondary = 1;
-       missing = (!have_primary) + (!have_secondary) + (!have_separator) + (!have_name);
-
-       if(sbar_num_fields+missing < MAX_SBAR_FIELDS)
-       {
-               if(!have_name)
-               {
-                       strunzone(sbar_title[sbar_num_fields]);
-                       for(i = sbar_num_fields; i > 0; --i)
-                       {
-                               sbar_title[i] = sbar_title[i-1];
-                               sbar_size[i] = sbar_size[i-1];
-                               sbar_field[i] = sbar_field[i-1];
-                       }
-                       sbar_title[0] = strzone("name");
-                       sbar_field[0] = SP_NAME;
-                       ++sbar_num_fields;
-                       print("fixed missing field 'name'\n");
-
-                       if(!have_separator)
-                       {
-                               strunzone(sbar_title[sbar_num_fields]);
-                               for(i = sbar_num_fields; i > 1; --i)
-                               {
-                                       sbar_title[i] = sbar_title[i-1];
-                                       sbar_size[i] = sbar_size[i-1];
-                                       sbar_field[i] = sbar_field[i-1];
-                               }
-                               sbar_title[1] = strzone("|");
-                               sbar_field[1] = SP_SEPARATOR;
-                               sbar_size[1] = stringwidth("|", FALSE, sbar_fontsize);
-                               ++sbar_num_fields;
-                               print("fixed missing field '|'\n");
-                       }
-               }
-               else if(!have_separator)
-               {
-                       strunzone(sbar_title[sbar_num_fields]);
-                       sbar_title[sbar_num_fields] = strzone("|");
-                       sbar_size[sbar_num_fields] = stringwidth("|", FALSE, sbar_fontsize);
-                       sbar_field[sbar_num_fields] = SP_SEPARATOR;
-                       ++sbar_num_fields;
-                       print("fixed missing field '|'\n");
-               }
-               if(!have_secondary)
-               {
-                       strunzone(sbar_title[sbar_num_fields]);
-                       sbar_title[sbar_num_fields] = strzone(scores_label[ps_secondary]);
-                       sbar_size[sbar_num_fields] = stringwidth(sbar_title[sbar_num_fields], FALSE, sbar_fontsize);
-                       sbar_field[sbar_num_fields] = ps_secondary;
-                       ++sbar_num_fields;
-                       print("fixed missing field '", scores_label[ps_secondary], "'\n");
-               }
-               if(!have_primary)
-               {
-                       strunzone(sbar_title[sbar_num_fields]);
-                       sbar_title[sbar_num_fields] = strzone(scores_label[ps_primary]);
-                       sbar_size[sbar_num_fields] = stringwidth(sbar_title[sbar_num_fields], FALSE, sbar_fontsize);
-                       sbar_field[sbar_num_fields] = ps_primary;
-                       ++sbar_num_fields;
-                       print("fixed missing field '", scores_label[ps_primary], "'\n");
-               }
-       }
-
-       sbar_field[sbar_num_fields] = SP_END;
-}
-
-// MOVEUP::
-vector sbar_field_rgb;
-string sbar_field_icon0;
-string sbar_field_icon1;
-string sbar_field_icon2;
-vector sbar_field_icon0_rgb;
-vector sbar_field_icon1_rgb;
-vector sbar_field_icon2_rgb;
-float sbar_field_icon0_alpha;
-float sbar_field_icon1_alpha;
-float sbar_field_icon2_alpha;
-string Sbar_GetField(entity pl, float field)
-{
-       float tmp, num, denom, f;
-       string str;
-       sbar_field_rgb = '1 1 1';
-       sbar_field_icon0 = "";
-       sbar_field_icon1 = "";
-       sbar_field_icon2 = "";
-       sbar_field_icon0_rgb = '1 1 1';
-       sbar_field_icon1_rgb = '1 1 1';
-       sbar_field_icon2_rgb = '1 1 1';
-       sbar_field_icon0_alpha = 1;
-       sbar_field_icon1_alpha = 1;
-       sbar_field_icon2_alpha = 1;
-       switch(field)
-       {
-               case SP_PING:
-                       if not(pl.gotscores)
-                               return "\x8D\x8D\x8D"; // >>> sign
-                       //str = getplayerkey(pl.sv_entnum, "ping");
-                       f = pl.ping;
-                       if(f == 0)
-                               return "N/A";
-                       tmp = max(0, min(220, f-80)) / 220;
-                       sbar_field_rgb = '1 1 1' - '0 1 1'*tmp;
-                       return ftos(f);
-
-               case SP_PL:
-                       if not(pl.gotscores)
-                               return "N/A";
-                       f = pl.ping_packetloss;
-                       tmp = pl.ping_movementloss;
-                       if(f == 0 && tmp == 0)
-                               return "";
-                       str = ftos(ceil(f * 100));
-                       if(tmp != 0)
-                               str = strcat(str, "~", ftos(ceil(tmp * 100)));
-                       tmp = bound(0, f / 0.2 + tmp / 0.04, 1); // 20% is REALLY BAD pl
-                       sbar_field_rgb = '1 0.5 0.5' - '0 0.5 0.5'*tmp;
-                       return str;
-
-               case SP_NAME:
-                       if(ready_waiting && pl.ready)
-                       {
-                               sbar_field_icon0 = "gfx/sb_player_ready";
-                       }
-                       else if(!teamplay)
-                       {
-                               f = stof(getplayerkey(pl.sv_entnum, "colors"));
-                               {
-                                       sbar_field_icon0 = "gfx/sb_playercolor_base";
-                                       sbar_field_icon1 = "gfx/sb_playercolor_shirt";
-                                       sbar_field_icon1_rgb = colormapPaletteColor(floor(f / 16), 0);
-                                       sbar_field_icon2 = "gfx/sb_playercolor_pants";
-                                       sbar_field_icon2_rgb = colormapPaletteColor(mod(f, 16), 1);
-                               }
-                       }
-                       return GetPlayerName(pl.sv_entnum);
-
-               case SP_FRAGS:
-                       f = pl.(scores[SP_KILLS]);
-                       f -= pl.(scores[SP_SUICIDES]);
-                       return ftos(f);
-
-               case SP_KDRATIO:
-                       num = pl.(scores[SP_KILLS]);
-                       denom = pl.(scores[SP_DEATHS]);
-
-                       if(denom == 0) {
-                               sbar_field_rgb = '0 1 0';
-                               str = ftos(num);
-                       } else if(num <= 0) {
-                               sbar_field_rgb = '1 0 0';
-                               str = ftos(num/denom);
-                       } else
-                               str = ftos(num/denom);
-
-                       tmp = strstrofs(str, ".", 0);
-                       if(tmp > 0)
-                               str = substring(str, 0, tmp+2);
-                       return str;
-
-               default:
-                       tmp = pl.(scores[field]);
-                       f = scores_flags[field];
-                       if(field == ps_primary)
-                               sbar_field_rgb = '1 1 0';
-                       else if(field == ps_secondary)
-                               sbar_field_rgb = '0 1 1';
-                       else
-                               sbar_field_rgb = '1 1 1';
-                       return ScoreString(f, tmp);
-       }
-       //return "error";
-}
-
-float xmin, xmax, ymin, ymax, sbwidth;
-float sbar_fixscoreboardcolumnwidth_len;
-float sbar_fixscoreboardcolumnwidth_iconlen;
-float sbar_fixscoreboardcolumnwidth_marginlen;
-
-float stringwidth_colors(string s, vector theSize)
-{
-       return stringwidth(s, TRUE, theSize);
-}
-
-float stringwidth_nocolors(string s, vector theSize)
-{
-       return stringwidth(s, FALSE, theSize);
-}
-
-string Sbar_FixScoreboardColumnWidth(float i, string str)
-{
-       float field, f;
-       vector sz;
-       field = sbar_field[i];
-
-       sbar_fixscoreboardcolumnwidth_iconlen = 0;
-
-       if(sbar_field_icon0 != "")
-       {
-               sz = drawgetimagesize(sbar_field_icon0);
-               f = sz_x / sz_y;
-               if(sbar_fixscoreboardcolumnwidth_iconlen < f)
-                       sbar_fixscoreboardcolumnwidth_iconlen = f;
-       }
-
-       if(sbar_field_icon1 != "")
-       {
-               sz = drawgetimagesize(sbar_field_icon1);
-               f = sz_x / sz_y;
-               if(sbar_fixscoreboardcolumnwidth_iconlen < f)
-                       sbar_fixscoreboardcolumnwidth_iconlen = f;
-       }
-
-       if(sbar_field_icon2 != "")
-       {
-               sz = drawgetimagesize(sbar_field_icon2);
-               f = sz_x / sz_y;
-               if(sbar_fixscoreboardcolumnwidth_iconlen < f)
-                       sbar_fixscoreboardcolumnwidth_iconlen = f;
-       }
-
-       sbar_fixscoreboardcolumnwidth_iconlen *= sbar_fontsize_y / sbar_fontsize_x; // fix icon aspect
-
-       if(sbar_fixscoreboardcolumnwidth_iconlen != 0)
-               sbar_fixscoreboardcolumnwidth_marginlen = stringwidth(" ", FALSE, sbar_fontsize);
-       else
-               sbar_fixscoreboardcolumnwidth_marginlen = 0;
-
-       if(field == SP_NAME) // name gets all remaining space
-       {
-               float namesize, j;
-               namesize = sbwidth;// / sbar_fontsize_x;
-               for(j = 0; j < sbar_num_fields; ++j)
-                       if(j != i)
-                               if (sbar_field[i] != SP_SEPARATOR)
-                                       namesize -= sbar_size[j] + 1;
-               namesize += 1;
-               sbar_size[i] = namesize;
-               
-               if (sbar_fixscoreboardcolumnwidth_iconlen != 0)
-                       namesize -= sbar_fixscoreboardcolumnwidth_marginlen + sbar_fixscoreboardcolumnwidth_iconlen;
-               str = textShortenToWidth(str, namesize, sbar_fontsize, stringwidth_colors);
-               sbar_fixscoreboardcolumnwidth_len = stringwidth(str, TRUE, sbar_fontsize);
-       }
-       else
-               sbar_fixscoreboardcolumnwidth_len = stringwidth(str, FALSE, sbar_fontsize);
-       
-       f = sbar_fixscoreboardcolumnwidth_len + sbar_fixscoreboardcolumnwidth_marginlen + sbar_fixscoreboardcolumnwidth_iconlen;
-       if(sbar_size[i] < f)
-               sbar_size[i] = f;
-
-       return str;
-}
-
-void Sbar_PrintScoreboardItem(vector pos, entity pl, float is_self, float pl_number)
-{
-       vector tmp, rgb;
-       rgb = GetTeamRGB(pl.team);
-       string str;
-       float i, field;
-       float is_spec;
-       is_spec = (GetPlayerColor(pl.sv_entnum) == COLOR_SPECTATOR);
-       
-       if((rgb == '1 1 1') && (!is_spec)) {
-               rgb_x = cvar("sbar_color_bg_r") + 0.5;
-               rgb_y = cvar("sbar_color_bg_g") + 0.5;
-               rgb_z = cvar("sbar_color_bg_b") + 0.5; }
-               
-       // Layout:
-       tmp_x = sbwidth;
-       tmp_y = sbar_fontsize_y * 1.25;
-       tmp_z = 0;
-
-       // alternated rows highlighting
-       if(is_self)
-               drawfill(pos - '1 1 0', tmp + '2 0 0', rgb, sbar_scoreboard_highlight_alpha_self, DRAWFLAG_NORMAL);
-       else if((sbar_scoreboard_highlight) && (!mod(pl_number,2)))
-               drawfill(pos - '1 1 0', tmp + '2 0 0', rgb, sbar_scoreboard_highlight_alpha, DRAWFLAG_NORMAL);
-
-       tmp_y = 0;
-
-       for(i = 0; i < sbar_num_fields; ++i)
-       {
-               field = sbar_field[i];
-               if(field == SP_SEPARATOR)
-                       break;
-
-               if(is_spec && field != SP_NAME && field != SP_PING) {
-                       pos_x += sbar_size[i] + sbar_fontsize_x;
-                       continue;
-               }
-               str = Sbar_GetField(pl, field);
-               str = Sbar_FixScoreboardColumnWidth(i, str);
-
-               pos_x += sbar_size[i] + sbar_fontsize_x;
-
-               if(field == SP_NAME) {
-                       tmp_x = sbar_size[i] - sbar_fontsize_x*sbar_fixscoreboardcolumnwidth_iconlen - sbar_fixscoreboardcolumnwidth_marginlen + sbar_fontsize_x;
-                       if (is_self)
-                               drawcolorcodedstring(pos - tmp, str, sbar_fontsize, sbar_scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
-                       else
-                               drawcolorcodedstring(pos - tmp, str, sbar_fontsize, sbar_scoreboard_alpha_name, DRAWFLAG_NORMAL);
-               } else {
-                       tmp_x = sbar_fixscoreboardcolumnwidth_len + sbar_fontsize_x;
-                       if (is_self)
-                               drawstring(pos - tmp, str, sbar_fontsize, sbar_field_rgb, sbar_scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
-                       else
-                               drawstring(pos - tmp, str, sbar_fontsize, sbar_field_rgb, sbar_scoreboard_alpha_name, DRAWFLAG_NORMAL);
-               }
-
-               tmp_x = sbar_size[i] + sbar_fontsize_x;
-               if(sbar_field_icon0 != "")
-                       if (is_self)
-                               drawpic(pos - tmp, sbar_field_icon0, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon1_rgb, sbar_field_icon0_alpha * sbar_scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
-                       else
-                               drawpic(pos - tmp, sbar_field_icon0, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon1_rgb, sbar_field_icon0_alpha * sbar_scoreboard_alpha_name, DRAWFLAG_NORMAL);
-               if(sbar_field_icon1 != "")
-                       if (is_self)
-                               drawpic(pos - tmp, sbar_field_icon1, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon1_rgb, sbar_field_icon1_alpha * sbar_scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
-                       else
-                               drawpic(pos - tmp, sbar_field_icon1, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon1_rgb, sbar_field_icon1_alpha * sbar_scoreboard_alpha_name, DRAWFLAG_NORMAL);
-               if(sbar_field_icon2 != "")
-                       if (is_self)
-                               drawpic(pos - tmp, sbar_field_icon2, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon2_rgb, sbar_field_icon2_alpha * sbar_scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
-                       else
-                               drawpic(pos - tmp, sbar_field_icon2, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon2_rgb, sbar_field_icon2_alpha * sbar_scoreboard_alpha_name, DRAWFLAG_NORMAL);
-       }
-
-       if(sbar_field[i] == SP_SEPARATOR)
-       {
-               pos_x = xmax;
-               for(i = sbar_num_fields-1; i > 0; --i)
-               {
-                       field = sbar_field[i];
-                       if(field == SP_SEPARATOR)
-                               break;
-
-                       if(is_spec && field != SP_NAME && field != SP_PING) {
-                               pos_x -= sbar_size[i] + sbar_fontsize_x;
-                               continue;
-                       }
-
-                       str = Sbar_GetField(pl, field);
-                       str = Sbar_FixScoreboardColumnWidth(i, str);
-
-                       if(field == SP_NAME) {
-                               tmp_x = sbar_fixscoreboardcolumnwidth_len; // left or right aligned? let's put it right...
-                               if(is_self)
-                                       drawcolorcodedstring(pos - tmp, str, sbar_fontsize, sbar_scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
-                               else
-                                       drawcolorcodedstring(pos - tmp, str, sbar_fontsize, sbar_scoreboard_alpha_name, DRAWFLAG_NORMAL);
-                       } else {
-                               tmp_x = sbar_fixscoreboardcolumnwidth_len;
-                               if(is_self)
-                                       drawstring(pos - tmp, str, sbar_fontsize, sbar_field_rgb, sbar_scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
-                               else
-                                       drawstring(pos - tmp, str, sbar_fontsize, sbar_field_rgb, sbar_scoreboard_alpha_name, DRAWFLAG_NORMAL);
-                       }
-
-                       tmp_x = sbar_size[i];
-                       if(sbar_field_icon0 != "")
-                               if (is_self)
-                                       drawpic(pos - tmp, sbar_field_icon0, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon1_rgb, sbar_field_icon0_alpha * sbar_scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
-                               else
-                                       drawpic(pos - tmp, sbar_field_icon0, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon1_rgb, sbar_field_icon0_alpha * sbar_scoreboard_alpha_name, DRAWFLAG_NORMAL);
-                       if(sbar_field_icon1 != "")
-                               if (is_self)
-                                       drawpic(pos - tmp, sbar_field_icon1, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon1_rgb, sbar_field_icon1_alpha * sbar_scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
-                               else
-                                       drawpic(pos - tmp, sbar_field_icon1, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon1_rgb, sbar_field_icon1_alpha * sbar_scoreboard_alpha_name, DRAWFLAG_NORMAL);
-                       if(sbar_field_icon2 != "")
-                               if (is_self)
-                                       drawpic(pos - tmp, sbar_field_icon2, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon2_rgb, sbar_field_icon2_alpha * sbar_scoreboard_alpha_name_self, DRAWFLAG_NORMAL);
-                               else
-                                       drawpic(pos - tmp, sbar_field_icon2, '0 1 0' * sbar_fontsize_y + '1 0 0' * sbar_fontsize_x * sbar_fixscoreboardcolumnwidth_iconlen, sbar_field_icon2_rgb, sbar_field_icon2_alpha * sbar_scoreboard_alpha_name, DRAWFLAG_NORMAL);
-                       pos_x -= sbar_size[i] + sbar_fontsize_x;
-               }
-       }
-}
-
-/*
- * Sbar_Scoreboard_MakeTable
- *
- * Makes a table for a team (for all playing players in DM) and fills it
- */
-
-vector Sbar_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_size)
-{
-       float body_table_height, i;
-       vector tmp, column_dim;
-       entity pl;
-
-       body_table_height = 1.25 * sbar_fontsize_y * max(1, tm.team_size); // no player? show 1 empty line
-
-       pos -= '1 1 0';
-
-       tmp_x = sbwidth + 2;
-       tmp_y = 1.25 * sbar_fontsize_y;
-
-       // rounded header
-       drawpic(pos, "gfx/hud/sb_scoreboard_tableheader", tmp, (rgb * sbar_color_bg_team) + '0.5 0.5 0.5', sbar_scoreboard_alpha_bg, DRAWFLAG_NORMAL);
-
-       // table border
-       tmp_y += sbar_border_thickness;
-       tmp_y += body_table_height;
-       drawborderlines(sbar_border_thickness, pos, tmp, '0 0 0', sbar_scoreboard_alpha_bg, DRAWFLAG_NORMAL); // more transparency for the scoreboard
-
-       // separator header/table
-       pos_y += 1.25 * sbar_fontsize_y;
-       tmp_y = sbar_border_thickness;
-       drawfill(pos, tmp, '0 0 0', sbar_scoreboard_alpha_bg, DRAWFLAG_NORMAL);
-
-       pos_y += sbar_border_thickness;
-
-       // table background
-       tmp_y = body_table_height;
-       drawpic_tiled(pos, "gfx/hud/sb_scoreboard_bg", bg_size, tmp, rgb * sbar_color_bg_team, sbar_scoreboard_alpha_bg, DRAWFLAG_NORMAL);
-
-       // anyway, apply some color
-       //drawfill(pos, tmp + '2 0 0', rgb, 0.1, DRAWFLAG_NORMAL);
-
-       // go back to the top to make alternated columns highlighting and to print the strings
-       pos_y -= 1.25 * sbar_fontsize_y;
-       pos_y -= sbar_border_thickness;
-
-       pos += '1 1 0';
-
-       if (sbar_scoreboard_highlight)
-       {
-               column_dim_y = 1.25 * sbar_fontsize_y; // header
-               column_dim_y += sbar_border_thickness;
-               column_dim_y += body_table_height;
-       }
-
-       // print the strings of the columns headers and draw the columns
-       for(i = 0; i < sbar_num_fields; ++i)
-       {
-               if(sbar_field[i] == SP_SEPARATOR)
-                       break;
-               column_dim_x = sbar_size[i] + sbar_fontsize_x;
-               if (sbar_scoreboard_highlight)
-               {
-                       if (mod(i,2))
-                               drawfill(pos - '0 1 0' - sbar_fontsize_x / 2 * '1 0 0', column_dim, '0 0 0', sbar_scoreboard_alpha_bg * 0.2, DRAWFLAG_NORMAL);
-               }
-               drawstring(pos, sbar_title[i], sbar_fontsize, rgb * 1.5, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-               pos_x += column_dim_x;
-       }
-       if(sbar_field[i] == SP_SEPARATOR)
-       {
-               pos_x = xmax;
-               tmp_y = 0;
-               for(i = sbar_num_fields-1; i > 0; --i)
-               {
-                       if(sbar_field[i] == SP_SEPARATOR)
-                               break;
-
-                       pos_x -= sbar_size[i];
-
-                       if (sbar_scoreboard_highlight)
-                       {
-                               if (!mod(i,2))
-                               {
-                                       if (i == sbar_num_fields-1)
-                                               column_dim_x = sbar_size[i] + sbar_fontsize_x / 2 + 1;
-                                       else
-                                               column_dim_x = sbar_size[i] + sbar_fontsize_x;
-                                       drawfill(pos - '0 1 0' - sbar_fontsize_x / 2 * '1 0 0', column_dim, '0 0 0', sbar_scoreboard_alpha_bg * 0.2, DRAWFLAG_NORMAL);
-                               }
-                       }
-
-                       tmp_x = stringwidth(sbar_title[i], FALSE, sbar_fontsize);
-                       tmp_x = sbar_size[i] - tmp_x;
-                       drawstring(pos + tmp, sbar_title[i], sbar_fontsize, rgb * 1.5, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-                       pos_x -= sbar_fontsize_x;
-               }
-       }
-       
-       pos_x = xmin;
-       pos_y += 1.25 * sbar_fontsize_y; // skip the header
-       pos_y += sbar_border_thickness;
-
-       // fill the table and draw the rows
-       i = 0;
-       if (teamplay)
-               for(pl = players.sort_next; pl; pl = pl.sort_next)
-               {
-                       if(pl.team != tm.team)
-                               continue;
-                       Sbar_PrintScoreboardItem(pos, pl, (pl.sv_entnum == player_localentnum - 1), i);
-                       pos_y += 1.25 * sbar_fontsize_y;
-                       ++i;
-               }
-       else
-               for(pl = players.sort_next; pl; pl = pl.sort_next)
-               {
-                       if(pl.team == COLOR_SPECTATOR)
-                               continue;
-                       Sbar_PrintScoreboardItem(pos, pl, (pl.sv_entnum == player_localentnum - 1), i);
-                       pos_y += 1.25 * sbar_fontsize_y;
-                       ++i;
-               }
-       
-       if (i == 0)
-               pos_y += 1.25 * sbar_fontsize_y; // move to the end of the table
-       pos_y += 1.25 * sbar_fontsize_y; // move empty row (out of the table)
-
-       return pos;
-}
-
-float Sbar_WouldDrawScoreboard() {
-       if (sb_showscores)
-               return 1;
-       else if (intermission == 1)
-               return 1;
-       else if (intermission == 2)
-               return 1;
-       else if (getstati(STAT_HEALTH) <= 0 && cvar("cl_deathscoreboard"))
-               return 1;
-       else if(sb_showscores_force)
-               return 1;
-       return 0;
-}
-
-float g_minstagib;
-float average_accuracy;
-vector Sbar_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size)
-{
-       float i;
-       float weapon_hit, weapon_damage, weapon_stats;
-       float fontsize = 40 * 1/3;
-       float xsave;
-       float weapon_cnt;
-       float rows;
-       if(cvar("sbar_accuracy_doublerows"))
-               rows = 2;
-       else
-               rows = 1;
-       float height = 40;
-
-       if(warmup_stage)
-       {
-               return pos;
-       }
-
-       xsave = pos_x;
-       drawstring(pos, strcat("Accuracy stats (average ", ftos(average_accuracy), "%)"), sbar_fontsize, '1 1 1', sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-       pos_y += 18;
-       vector tmp;
-       tmp_x = sbwidth;
-       tmp_y = height * rows;
-
-       drawpic_tiled(pos, "gfx/hud/sb_scoreboard_bg", bg_size, tmp, rgb * sbar_color_bg_team, sbar_scoreboard_alpha_bg, DRAWFLAG_NORMAL);
-       drawborderlines(sbar_accuracy_border_thickness, pos, tmp, '0 0 0', sbar_scoreboard_alpha_bg * 0.75, DRAWFLAG_NORMAL);
-
-       // column highlighting
-       for(i = 0; i < weapon_cnt/rows; ++i)
-       {
-               if(!mod(i, 2))
-                       drawfill(pos + '1 0 0' * (sbwidth/weapon_cnt) * rows * i, '0 1 0' * height * rows + '1 0 0' * (sbwidth/weapon_cnt) * rows, '0 0 0', sbar_scoreboard_alpha_bg * 0.2, DRAWFLAG_NORMAL);
-       }
-
-       // row highlighting
-       for(i = 0; i < rows; ++i)
-       {
-               drawfill(pos + '0 1 0' * height * (2/3) + '0 1 0' * height * i, '1 0 0' * sbwidth + '0 1 0' * fontsize, '1 1 1', sbar_scoreboard_highlight_alpha, DRAWFLAG_NORMAL);     
-       }
-
-       if(getstati(STAT_SWITCHWEAPON) == WEP_MINSTANEX)
-               g_minstagib = 1; // TODO: real detection for minstagib?
-
-       // skip useless weapons
-       weapon_cnt = 0;
-       for(i = WEP_FIRST; i <= WEP_LAST; ++i)
-       {
-               self = get_weaponinfo(i);
-               if not(self.weapons)
-                       continue;
-               if ((i == WEP_NEX && g_minstagib) || i == WEP_PORTO || (i == WEP_MINSTANEX && !g_minstagib) || i == WEP_TUBA || i == WEP_FIREBALL) // skip port-o-launch, nex || minstanex, tuba and fireball
-                       continue;
-               ++weapon_cnt;
-       }
-
-       drawfont = sbar_bigfont;
-       average_accuracy = 0;
-       float weapons_with_stats;
-       weapons_with_stats = 0;
-       if(rows == 2)
-               pos_x += sbwidth/weapon_cnt / 2;
-
-       for(i = WEP_FIRST; i <= WEP_LAST; ++i)
-       {
-               self = get_weaponinfo(i);
-               if not(self.weapons)
-                       continue;
-               if ((i == WEP_NEX && g_minstagib) || i == WEP_PORTO || (i == WEP_MINSTANEX && !g_minstagib) || i == WEP_TUBA || i == WEP_FIREBALL) // skip port-o-launch, nex || minstanex, tuba and fireball
-                       continue;
-               weapon_hit = weapon_hits[i-WEP_FIRST];
-               weapon_damage = weapon_fired[i-WEP_FIRST];
-               if(weapon_damage)
-                       weapon_stats = bound(0, floor(100 * weapon_hit / weapon_damage), 100);
-               float weapon_alpha;
-
-               if(weapon_damage)
-                       weapon_alpha = sbar_scoreboard_alpha_fg;
-               else
-                       weapon_alpha = 0.2 * sbar_scoreboard_alpha_fg;
-
-               // weapon icon
-               drawpic(pos, strcat("gfx/hud/inv_weapon", self.netname), '1 0 0' * sbwidth * (1/weapon_cnt) + '0 1 0' * height * (2/3), '1 1 1', weapon_alpha, DRAWFLAG_NORMAL);
-               // the accuracy
-               if(weapon_damage) {
-                       weapons_with_stats += 1;
-                       average_accuracy += weapon_stats; // store sum of all accuracies in average_accuracy
-
-                       string s;
-                       s = strcat(ftos(weapon_stats),"%");
-
-                       float padding;
-                       padding = ((sbwidth/weapon_cnt) - stringwidth(s, FALSE, '1 0 0' * fontsize)) / 2; // center the accuracy value
-
-                       rgb = Sbar_AccuracyColor(weapon_stats);
-                       drawstring(pos + '1 0 0' * padding + '0 1 0' * height * (2/3), s, '1 1 0' * fontsize, rgb, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-               }
-               pos_x += sbwidth/weapon_cnt * rows;
-               if(rows == 2 && i == 6) {
-                       pos_x -= sbwidth;
-                       pos_y += height;
-               }
-       }
-       drawfont = sbar_font;
-
-       if(weapons_with_stats)
-               average_accuracy = floor(average_accuracy / weapons_with_stats);
-
-       pos_x = xsave;
-       pos_y += height;
-       return pos;
-}
-
-string race_PlaceName(float pos) {
-       if(pos == 1)
-               return "1st";
-       else if(pos == 2)
-               return "2nd";
-       else if(pos == 3)
-               return "3rd";
-       else
-               return strcat(ftos(pos), "th");
-}
-
-vector Sbar_DrawScoreboardRankings(vector pos, entity pl,  vector rgb, vector bg_size)
-{
-       float i;
-       RANKINGS_RECEIVED_CNT = 0;
-               for (i=RANKINGS_CNT-1; i>=0; --i)
-                       if (grecordtime[i])
-                               RANKINGS_RECEIVED_CNT = RANKINGS_RECEIVED_CNT + 1;
-
-       if (RANKINGS_RECEIVED_CNT == 0)
-               return pos;
-
-       float is_spec;
-       is_spec = (GetPlayerColor(pl.sv_entnum) == COLOR_SPECTATOR);
-       vector hl_rgb;
-               hl_rgb_x = cvar("sbar_color_bg_r") + 0.5;
-               hl_rgb_y = cvar("sbar_color_bg_g") + 0.5;
-               hl_rgb_z = cvar("sbar_color_bg_b") + 0.5;
-
-       pos_y += sbar_fontsize_y;
-       drawstring(pos, strcat("Rankings"), sbar_fontsize, '1 1 1', sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-       pos_y += sbar_fontsize_y;
-       vector tmp;
-       tmp_x = sbwidth;
-       tmp_y = sbar_fontsize_y * RANKINGS_RECEIVED_CNT;
-
-       drawpic_tiled(pos, "gfx/hud/sb_scoreboard_bg", bg_size, tmp, rgb * sbar_color_bg_team, sbar_scoreboard_alpha_bg, DRAWFLAG_NORMAL);
-       drawborderlines(sbar_border_thickness, pos, tmp, '0 0 0', sbar_scoreboard_alpha_bg * 0.75, DRAWFLAG_NORMAL);
-
-       // row highlighting
-       for(i = 0; i<RANKINGS_RECEIVED_CNT; ++i)
-       {
-               string n, p;
-               float t;
-               t = grecordtime[i];
-               if (t == 0)
-                       continue;
-               n = grecordholder[i];
-               p = race_PlaceName(i+1);
-               if(grecordholder[i] == GetPlayerName(player_localentnum - 1))
-                       drawfill(pos, '1 0 0' * sbwidth + '0 1 0' * sbar_fontsize_y, hl_rgb, sbar_scoreboard_highlight_alpha_self, DRAWFLAG_NORMAL);    
-               else if(!mod(i, 2) && sbar_scoreboard_highlight)
-                       drawfill(pos, '1 0 0' * sbwidth + '0 1 0' * sbar_fontsize_y, hl_rgb, sbar_scoreboard_highlight_alpha, DRAWFLAG_NORMAL); 
-               drawstring(pos, p, sbar_fontsize, '1 1 1', sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-               drawstring(pos + '3 0 0' * sbar_fontsize_x, TIME_ENCODED_TOSTRING(t), sbar_fontsize, '1 1 1', sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-               drawcolorcodedstring(pos + '8 0 0' * sbar_fontsize_x, n, sbar_fontsize, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-               pos += '0 1 0' * sbar_fontsize_y;
-       }
-
-       return pos;
-}
-
-float scoreboard_bottom;
-float sbar_scoreboard_fade_alpha;
-float sbar_woulddrawscoreboard_prev;
-float sbar_woulddrawscoreboard_change; // "time" at which Sbar_WouldDrawScoreboard() changed
-void Sbar_DrawScoreboard()
-{
-       float sbar_woulddrawscoreboard; 
-       sbar_woulddrawscoreboard = Sbar_WouldDrawScoreboard();
-       if(sbar_woulddrawscoreboard != sbar_woulddrawscoreboard_prev) {
-               sbar_woulddrawscoreboard_change = time;
-               sbar_woulddrawscoreboard_prev = sbar_woulddrawscoreboard;
-       }
-
-       float scoreboard_fadeinspeed = cvar_or("sbar_scoreboard_fadeinspeed", 10);
-       float scoreboard_fadeoutspeed = cvar_or("sbar_scoreboard_fadeoutspeed", 5);
-       if(sbar_woulddrawscoreboard) {
-               if (scoreboard_fadeinspeed)
-                       sbar_scoreboard_fade_alpha = bound (0, (time - sbar_woulddrawscoreboard_change) * scoreboard_fadeinspeed, 1);
-               else
-                       sbar_scoreboard_fade_alpha = 1;
-       }
-       else
-               if (scoreboard_fadeoutspeed)
-                       sbar_scoreboard_fade_alpha = bound (0, (1/scoreboard_fadeoutspeed - (time - sbar_woulddrawscoreboard_change)) * scoreboard_fadeoutspeed, 1);
-               else
-                       sbar_scoreboard_fade_alpha = 0;
-
-       if not(sbar_scoreboard_fade_alpha)
-               return;
-               
-       sbar_scoreboard_alpha_bg = cvar("sbar_scoreboard_alpha_bg") * sbar_scoreboard_fade_alpha;
-       sbar_scoreboard_alpha_fg = cvar_or("sbar_scoreboard_alpha_fg", 1.0) * sbar_scoreboard_fade_alpha;
-       sbar_scoreboard_highlight = cvar("sbar_scoreboard_highlight");
-       sbar_scoreboard_highlight_alpha = cvar_or("sbar_scoreboard_highlight_alpha", 0.10) * sbar_scoreboard_alpha_fg;
-       sbar_scoreboard_highlight_alpha_self = cvar_or("sbar_scoreboard_highlight_alpha_self", 0.25) * sbar_scoreboard_alpha_fg;
-       sbar_scoreboard_alpha_name = cvar_or("sbar_scoreboard_alpha_name", 0.9) * sbar_scoreboard_alpha_fg;
-       sbar_scoreboard_alpha_name_self = cvar_or("sbar_scoreboard_alpha_name_self", 1) * sbar_scoreboard_alpha_fg;
-       
-       vector rgb, pos, tmp;
-       entity pl, tm;
-
-       sbwidth = Sbar_GetWidth(6.5 * sbar_fontsize_y);
-
-       xmin = 0.5 * (vid_conwidth - sbwidth);
-       ymin = SCOREBOARD_OFFSET;
-
-       xmax = vid_conwidth - xmin;
-       ymax = vid_conheight - 0.2*vid_conheight;
-
-       // Initializes position
-       pos_x = xmin;
-       pos_y = ymin;
-       pos_z = 0;
-
-       // Heading
-       drawfont = sbar_bigfont;
-       drawstringcenter('0 1 0' * ymin, "Scoreboard", '24 24 0', '1 1 1', sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-
-       pos_y += 24 + 4;
-       pos_y += sbar_fontsize_y;
-
-       drawfont = sbar_font;
-
-       // Draw the scoreboard
-       vector bg_size;
-       bg_size = drawgetimagesize("gfx/hud/sb_scoreboard_bg");
-
-       if(teamplay)
-       {
-               for(tm = teams.sort_next; tm; tm = tm.sort_next)
-               {
-                       if(tm.team == COLOR_SPECTATOR)
-                               continue;
-
-                       rgb = GetTeamRGB(tm.team);
-                       Sbar_DrawXNum(pos - '9.5 0 0' * sbar_fontsize_y + '0 1 0' * sbar_fontsize_y, tm.(teamscores[ts_primary]), 6, 0, sbar_fontsize_y * 1.5, rgb, 0, 1, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-                               
-                       if(ts_primary != ts_secondary)
-                               Sbar_DrawXNum(pos - '7.5 0 0' * sbar_fontsize_y + '0 2.5 0' * sbar_fontsize_y, tm.(teamscores[ts_secondary]), 6, 0, sbar_fontsize_y * 1, rgb, 0, 1, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-
-                       pos = Sbar_Scoreboard_MakeTable(pos, tm, rgb, bg_size);
-               }
-       }
-       else
-       {
-               rgb_x = cvar("sbar_color_bg_r");
-               rgb_y = cvar("sbar_color_bg_g");
-               rgb_z = cvar("sbar_color_bg_b");
-
-               for(tm = teams.sort_next; tm; tm = tm.sort_next)
-               {
-                       if(tm.team == COLOR_SPECTATOR)
-                               continue;
-
-                       pos = Sbar_Scoreboard_MakeTable(pos, tm, rgb, bg_size);
-               }
-       }
-
-       if(gametype == GAME_CTS || gametype == GAME_RACE) {
-               if(race_speedaward) {
-                       drawcolorcodedstring(pos, strcat("Speed award: ", ftos(race_speedaward), " (", race_speedaward_holder, ")"), sbar_fontsize, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-                       pos_y += 1.25 * sbar_fontsize_y;
-               }
-               if(race_speedaward_alltimebest) {
-                       drawcolorcodedstring(pos, strcat("All-time fastest: ", ftos(race_speedaward_alltimebest), " (", race_speedaward_alltimebest_holder, ")"), sbar_fontsize, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-                       pos_y += 1.25 * sbar_fontsize_y;
-               }
-               pos = Sbar_DrawScoreboardRankings(pos, pl, rgb, bg_size);
-       }
-       else if(cvar("sbar_accuracy") && spectatee_status != -1) {
-               if(teamplay)
-                       pos = Sbar_DrawScoreboardAccuracyStats(pos, GetTeamRGB(myteam), bg_size);
-               else
-                       pos = Sbar_DrawScoreboardAccuracyStats(pos, rgb, bg_size);
-       }
-
-       tmp = pos + '0 1.5 0' * sbar_fontsize_y;
-       pos_y += 3 * sbar_fontsize_y;
-
-       // List spectators
-       float specs;
-       specs = 0;
-       for(pl = players.sort_next; pl; pl = pl.sort_next)
-       {
-               if(pl.team != COLOR_SPECTATOR)
-                       continue;
-               Sbar_PrintScoreboardItem(pos, pl, (pl.sv_entnum == player_localentnum - 1), specs);
-               pos_y += 1.25 * sbar_fontsize_y;
-               ++specs;
-       }
-
-       if(specs)
-               drawstring(tmp, "Spectators", sbar_fontsize, '1 1 1', sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-
-       // Print info string
-       string str;
-       float tl, fl, ll;
-       str = strcat("playing on ^2", shortmapname, "^7");
-       tl = getstatf(STAT_TIMELIMIT);
-       fl = getstatf(STAT_FRAGLIMIT);
-       ll = getstatf(STAT_LEADLIMIT);
-       if(gametype == GAME_LMS)
-       {
-               if(tl > 0)
-                       str = strcat(str, " for up to ^1", ftos(tl), " minutes^7");
-       }
-       else
-       {
-               if(tl > 0)
-                       str = strcat(str, " for ^1", ftos(tl), " minutes^7");
-               if(fl > 0)
-               {
-                       if(tl > 0)
-                               str = strcat(str, " or");
-                       if(teamplay)
-                       {
-                               str = strcat(str, " until ^3", ScoreString(teamscores_flags[ts_primary], fl));
-                               if(teamscores_label[ts_primary] == "score")
-                                       str = strcat(str, " points^7");
-                               else if(teamscores_label[ts_primary] == "fastest")
-                                       str = strcat(str, " is beaten^7");
-                               else
-                                       str = strcat(str, " ", teamscores_label[ts_primary]);
-                       }
-                       else
-                       {
-                               str = strcat(str, " until ^3", ScoreString(scores_flags[ps_primary], fl));
-                               if(scores_label[ps_primary] == "score")
-                                       str = strcat(str, " points^7");
-                               else if(scores_label[ps_primary] == "fastest")
-                                       str = strcat(str, " is beaten^7");
-                               else
-                                       str = strcat(str, " ", scores_label[ps_primary]);
-                       }
-               }
-               if(ll > 0)
-               {
-                       if(tl > 0 || fl > 0)
-                               str = strcat(str, " or");
-                       if(teamplay)
-                       {
-                               str = strcat(str, " until a lead of ^3", ScoreString(teamscores_flags[ts_primary], ll));
-                               if(teamscores_label[ts_primary] == "score")
-                                       str = strcat(str, " points^7");
-                               else if(teamscores_label[ts_primary] == "fastest")
-                                       str = strcat(str, " is beaten^7");
-                               else
-                                       str = strcat(str, " ", teamscores_label[ts_primary]);
-                       }
-                       else
-                       {
-                               str = strcat(str, " until a lead of ^3", ScoreString(scores_flags[ps_primary], ll));
-                               if(scores_label[ps_primary] == "score")
-                                       str = strcat(str, " points^7");
-                               else if(scores_label[ps_primary] == "fastest")
-                                       str = strcat(str, " is beaten^7");
-                               else
-                                       str = strcat(str, " ", scores_label[ps_primary]);
-                       }
-               }
-       }
-
-
-       pos_y += 1.2 * sbar_fontsize_y;
-       drawcolorcodedstring(pos + '0.5 0 0' * (sbwidth - stringwidth(str, TRUE, sbar_fontsize)), str, sbar_fontsize, sbar_scoreboard_alpha_fg, DRAWFLAG_NORMAL);
-
-       scoreboard_bottom = pos_y + 2 * sbar_fontsize_y;
-}
-
-string MakeRaceString(float cp, float mytime, float histime, float lapdelta, string hisname)
-{
-       string col;
-       string timestr;
-       string cpname;
-       string lapstr;
-       lapstr = "";
-
-       if(histime == 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 = strcat(" (-", ftos(lapdelta), "L)");
-                       col = "^2";
-               }
-               else if(lapdelta < 0)
-               {
-                       lapstr = strcat(" (+", ftos(-lapdelta), "L)");
-                       col = "^1";
-               }
-       }
-       else if(histime > 0) // anticipation
-       {
-               if(mytime >= histime)
-                       timestr = strcat("+", ftos_decimals(mytime - histime, TIME_DECIMALS));
-               else
-                       timestr = TIME_ENCODED_TOSTRING(TIME_ENCODE(histime));
-               col = "^3";
-       }
-       else
-               col = "^7";
-
-       if(cp == 254)
-               cpname = "Start line";
-       else if(cp == 255)
-               cpname = "Finish line";
-       else if(cp)
-               cpname = strcat("Intermediate ", ftos(cp));
-       else
-               cpname = "Finish line";
-
-       if(histime < 0)
-               return strcat(col, cpname);
-       else if(hisname == "")
-               return strcat(col, cpname, " (", timestr, ")");
-       else
-               return strcat(col, cpname, " (", timestr, " ", strcat(hisname, col, lapstr), ")");
-}
-
-float race_CheckName(string net_name) { // Does the name already exist in rankings? In that case, where? (otherwise 0)
-       float i;
-       for (i=RANKINGS_CNT-1;i>=0;--i)
-               if(grecordholder[i] == net_name)
-                       return i+1;
-       return 0;
-}
-
-float race_status_time;
-float race_status_prev;
-string race_status_name_prev;
-void Sbar_DrawRaceStatus(vector pos)
-{
-       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);
-       }
-
-       float a;
-       a = bound(0, race_status_time - time, 1);
-
-       string s;
-       s = textShortenToWidth(race_status_name, 120, '10 10 0', stringwidth_colors);
-
-       float rank;
-       if(race_status > 0)
-               rank = race_CheckName(race_status_name);
-       string rankname;
-       rankname = race_PlaceName(rank);
-
-       if(race_status == 0)
-               drawpic(pos, "gfx/hud/race/newfail", '80 80 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-       else if(race_status == 1) {
-               drawpic(pos, "gfx/hud/race/newtime", '80 80 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);   
-               drawcolorcodedstring(pos + '40 80 0' - '1 0 0' * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-               drawstring(pos + '40 20 0' - '1 0 0' * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-       } else if(race_status == 2) {
-               if(race_status_name == GetPlayerName(player_localentnum -1) || !race_myrank || race_myrank < rank)
-                       drawpic(pos, "gfx/hud/race/newrankgreen", '80 80 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-               else
-                       drawpic(pos, "gfx/hud/race/newrankyellow", '80 80 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-               drawcolorcodedstring(pos + '40 80 0' - '1 0 0' * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-               drawstring(pos + '40 20 0' - '1 0 0' * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-       } else if(race_status == 3) {
-               drawpic(pos, "gfx/hud/race/newrecordserver", '80 80 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-               drawcolorcodedstring(pos + '40 80 0' - '1 0 0' * stringwidth(s, TRUE, '5 0 0'), s, '10 10 0', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-               drawstring(pos + '40 20 0' - '1 0 0' * stringwidth(rankname, TRUE, '7 0 0'), rankname, '14 14 0', '1 1 1', sbar_alpha_fg * 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 Sbar_Score()
-{
-       float score, distribution, leader;
-       vector score_pos, secondary_score_pos, distribution_color;
-       entity tm, pl, me;
-       me = (spectatee_status > 0) ? playerslots[spectatee_status - 1] : playerslots[player_localentnum - 1];
-
-       vector bottomright;
-       bottomright_x = vid_conwidth;
-       bottomright_y = vid_conheight;
-       bottomright_z = 0;
-
-       score_pos = bottomright - '245 42 0'; // for same alignment as before: 294
-       secondary_score_pos = score_pos + '149 -6 0';
-
-       if((scores_flags[ps_primary] & SFL_TIME) && !teamplay) { // race/cts record display on HUD
-               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]);
-
-               float racemin, racesec, racemsec;
-               float distsec, distmsec, minusplus;
-               
-               racemin = floor(score/(60 * TIME_FACTOR));
-               racesec = floor((score - racemin*(60 * TIME_FACTOR))/TIME_FACTOR);
-               racemsec = score - racemin*60*TIME_FACTOR - racesec*TIME_FACTOR;
-
-               if (pl && ((!(scores_flags[ps_primary] & SFL_ZERO_IS_WORST)) || score)) {
-                       // distribution display
-                       distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]);
-
-                       if (distribution < TIME_FACTOR && distribution > -TIME_FACTOR)
-                               distmsec = fabs(distribution);
-                       else {
-                               distsec = floor(fabs(distribution)/TIME_FACTOR);
-                               distmsec = fabs(distribution) - distsec*TIME_FACTOR;
-                               if (distribution < 0)
-                                       distsec = -distsec;
-                       }
-
-                       if (distribution <= 0) {
-                               distribution_color = '0 1 0';
-                               minusplus = 1; // minusplus 1: always prefix with minus sign
-                       }
-                       else {
-                               distribution_color = '1 0 0';
-                               minusplus = 2; // minusplus 1: always prefix with plus sign
-                       }
-                       Sbar_DrawXNum(bottomright - '0 48 0' - '16 0 0' * TIME_DECIMALS, distmsec, -TIME_DECIMALS, 0, 16, distribution_color, 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-                       Sbar_DrawXNum(bottomright - '68 48 0' - '16 0 0' * TIME_DECIMALS, distsec, 4, minusplus, 16, distribution_color, 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-                       drawpic(bottomright - '10 48 0' - '16 0 0' * TIME_DECIMALS, "gfx/hud/num_dot", '16 16 0', distribution_color, sbar_alpha_fg, DRAWFLAG_ADDITIVE);
-               }
-               // race record display
-               if (distribution <= 0 || distribution == score) // draw the highlight background behind the timer if we have the lead
-                       drawpic(bottomright - '0 32 0' - '32 0 0' * (4 + TIME_DECIMALS), "gfx/hud/sb_highlight_4", '0 28 0' + '32 0 0' * (4 + TIME_DECIMALS), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-               Sbar_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0', racemsec, -TIME_DECIMALS, 0, 30, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-               Sbar_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0'  - '66 0 0', racesec, -2, 0, 30, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-               drawpic(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '18 0 0', "gfx/hud/num_dot", '30 30 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE);
-
-               Sbar_DrawXNum(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '132 0 0', racemin, -2, 0, 30, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-               drawpic(bottomright - '0 32 0' - TIME_DECIMALS * '30 0 0' - '84 0 0', "gfx/hud/num_colon", '30 30 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE);
-
-       } else if (!teamplay) { // non-teamgames, except race/cts
-               // me vector := [team/connected frags id]
-               pl = players.sort_next;
-               if(pl == me)
-                       pl = pl.sort_next;
-
-               if(pl)
-                       distribution = me.(scores[ps_primary]) - pl.(scores[ps_primary]);
-               else
-                       distribution = 0;
-
-               score = me.(scores[ps_primary]);
-               
-               if(distribution >= 5) {
-                       distribution_color = '0 1 0';
-                       leader = 1;
-               } else if(distribution >= 0) {
-                       distribution_color = '1 1 1';
-                       leader = 1;
-               } else if(distribution >= -5)
-                       distribution_color = '1 1 0';
-               else
-                       distribution_color = '1 0 0';
-               
-               Sbar_DrawXNum(secondary_score_pos, distribution, 6, 3, 16, distribution_color, 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-               Sbar_DrawXNum(score_pos, score, 6, 0, 34, distribution_color, leader, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-       } else { // teamgames
-               float max_fragcount;
-               max_fragcount = -999;
-
-               for(tm = teams.sort_next; tm; tm = tm.sort_next) {
-                       if(tm.team == COLOR_SPECTATOR || !tm.team_size) // no players? don't display
-                               continue;
-                       score = tm.(teamscores[ts_primary]);
-                       leader = 0;
-
-                       if (score > max_fragcount)
-                               max_fragcount = score;
-       
-                       if(tm.team == myteam) {
-                               if (max_fragcount == score)
-                                       leader = 1;
-                               Sbar_DrawXNum(score_pos, score, 4, 0, 34, GetTeamRGB(tm.team) * 0.8, leader, 1, sbar_alpha_fg, DRAWFLAG_NORMAL);
-                       } else {
-                               if (max_fragcount == score)
-                                       leader = 1;
-                               Sbar_DrawXNum(secondary_score_pos, score, 6, 0, 16, GetTeamRGB(tm.team) * 0.8, leader, 1, sbar_alpha_fg, DRAWFLAG_NORMAL);
-                               secondary_score_pos = secondary_score_pos + '0 16 0';
-                       }
-               }
-       }
-
-       if(gametype == GAME_RACE || gametype == GAME_CTS)
-       {
-               drawfont = sbar_bigfont;
-               float a, t;
-               vector m;
-               string s, forcetime;
-
-               m = '0.5 0 0' * vid_conwidth + '0 1 0' * cvar_or("cl_racetimer_position", 0.25) * vid_conheight;
-
-               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)
-                       {
-                               dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
-                               //drawcolorcodedstring(m - '0 16 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(m - '0 16 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-                       }
-
-                       if(race_penaltytime)
-                       {
-                               a = bound(0, 2 - (time - race_penaltyeventtime), 1);
-                               if(a > 0)
-                               {
-                                       s = strcat("^1PENALTY: ", ftos_decimals(race_penaltytime * 0.1, 1), " (", race_penaltyreason, ")");
-                                       dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
-                                       //drawcolorcodedstring(m - '0 32 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-                                       drawcolorcodedstring(m - '0 32 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-                               }
-                       }
-
-                       if(forcetime != "")
-                       {
-                               a = bound(0, (time - race_checkpointtime) / 0.5, 1);
-                               //drawstring_expanding(m - '16 0 0' * stringwidth(forcetime, FALSE), forcetime, '32 32 0', '1 1 1', sbar_alpha_fg, 0, a);
-                               drawstring_expanding(m - '1 0 0' * stringwidth(forcetime, FALSE, '16 0 0'), forcetime, '32 32 0', '1 1 1', sbar_alpha_fg, 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(m - '16 0 0' * stringwidth(s, FALSE), s, '32 32 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-                               drawstring(m - '0.5 0 0' * stringwidth(s, FALSE, '32 32 0'), s, '32 32 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-                       }
-               }
-               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);
-                               dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
-                               //drawcolorcodedstring(m - '0 16 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(m - '0 16 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', sbar_alpha_fg * 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);
-                               dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
-                               //drawcolorcodedstring(m - '0 0 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-                               drawcolorcodedstring(m - '0 0 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', sbar_alpha_fg * 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 = strcat("^1PENALTY: ", ftos_decimals(t - time, 1), " (", race_penaltyreason, ")");
-                                       else
-                                               s = strcat("^2PENALTY: 0.0 (", race_penaltyreason, ")");
-                                       dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
-                                       //drawcolorcodedstring(m - '0 32 0' - '8 0 0' * stringwidth(s, TRUE), s, '16 16 0', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-                                       drawcolorcodedstring(m - '0 32 0' - '0.5 0 0' * stringwidth(s, TRUE, '16 16 0'), s, '16 16 0', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
-                               }
-                       }
-               }
-
-               drawfont = sbar_font;
-       }
-}
-
-void Sbar_Timer()
-{
-       float timelimit, elapsedTime, minutes, seconds, timeleft, minutesLeft, secondsLeft;
-       vector bgpos, timer_color;
-       bgpos = '0 0 0';
-       
-       vector topright;
-       topright = '0 0 0';
-       topright_x = vid_conwidth;
-       
-       float scale;
-       scale = cvar_or("sbar_timer_scale", 1);
-       timelimit = getstatf(STAT_TIMELIMIT);
-
-       Sbar_DrawRaceStatus((topright_x - 100) * '1 0 0' + '0 30 0' * scale);
-       
-       timeleft = max(0, timelimit * 60 + getstatf(STAT_GAMESTARTTIME) - time);
-       timeleft = ceil(timeleft);
-       minutesLeft = floor(timeleft / 60);
-       secondsLeft = timeleft - minutesLeft*60;
-
-       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 (cvar("sbar_increment_maptime") || timelimit == 0 || warmup_stage) {
-               if (time < getstatf(STAT_GAMESTARTTIME)) {
-                       //while restart is still active, show 00:00
-                       minutes = seconds = 0;
-               } else {
-                       elapsedTime = floor(time - getstatf(STAT_GAMESTARTTIME)); //127
-                       minutes = floor(elapsedTime / 60);
-                       seconds = elapsedTime - minutes*60;
-               }
-               if (minutes < 10)
-                       bgpos_x = topright_x - (54 + 17 + 12) * scale;
-               else if (minutes < 100) // nudge the timer background left if more digits are drawn
-                       bgpos_x = topright_x - (72 + 17 + 12) * scale;
-               else
-                       bgpos_x = topright_x - (90 + 17 + 12) * scale;
-               bgpos_y = 0;
-               bgpos_z = 0;
-       } else {
-               minutes = minutesLeft;
-               seconds = secondsLeft;
-               if (minutes == 0)
-                       bgpos_x = topright_x - (36 + 7 + 12) * scale;
-               else if (minutes < 10) // nudge the timer background left if more digits are drawn
-                       bgpos_x = topright_x - (54 + 17 + 12) * scale;
-               else if (minutes < 100)
-                       bgpos_x = topright_x - (72 + 17 + 12) * scale;
-               else
-                       bgpos_x = topright_x - (90 + 17 + 12) * scale;
-               bgpos_y = 0;
-               bgpos_z = 0;
-       }
-
-       if (cvar("viewsize") <= 100) { // draw timer background when viewsize <= 100
-               if (teamplay)
-                       drawpic(bgpos, "gfx/hud/sb_timerbg", '120 30 0' * scale, GetTeamRGB(myteam) * sbar_color_bg_team, sbar_alpha_bg, DRAWFLAG_NORMAL); // timer bg color = myteam color
-               else {
-                       color_x = cvar("sbar_color_bg_r");
-                       color_y = cvar("sbar_color_bg_g");
-                       color_z = cvar("sbar_color_bg_b");
-
-                       drawpic(bgpos, "gfx/hud/sb_timerbg", '120 30 0' * scale, color, sbar_alpha_bg, DRAWFLAG_NORMAL);
-               }
-       }
-
-       if(minutesLeft >= 1 || cvar("sbar_increment_maptime") || timelimit == 0 || warmup_stage) {
-               Sbar_DrawXNum(topright - ('103 0 0' - '0 2 0') * scale, minutes, 3, 0, 18 * scale, timer_color, 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-               drawpic(topright - ('53 0 0' - '0 1 0') * scale, "gfx/hud/num_colon", '18 18 0' * scale, timer_color, sbar_alpha_fg, DRAWFLAG_NORMAL);
-       }
-       Sbar_DrawXNum(topright - ('36 0 0' + '3 0 0' - '0 2 0') * scale, seconds, -2, 0, 18 * scale, timer_color, 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-}
-
-void CSQC_Strength_Timer() {
-       vector pos;
-       vector bottom;
-
-       bottom_x = vid_conwidth/2;
-       bottom_y = vid_conheight;
-       bottom_z = 0;
-
-       float stat_items, dt;
-       stat_items = getstati(STAT_ITEMS);
-       /*
-       if not(stat_items & IT_STRENGTH)
-               if not(stat_items & IT_INVINCIBLE)
-                       return;
-       */
-
-       if (getstati(STAT_HEALTH) <= 0)
-               return;
-
-       vector picsize;
-       float strength_time, invincibility_time, countdown_fontsize;
-
-       picsize = '22 22 0';
-       countdown_fontsize = 18;
-
-       if (vid_conwidth >= 800)
-               pos = bottom + '192 -46 0';
-       else
-               pos = bottom + '192 -94 0';
-
-       //strength
-       strength_time = getstatf(STAT_STRENGTH_FINISHED);
-       invincibility_time = getstatf(STAT_INVINCIBLE_FINISHED);
-
-       if (strength_time) {
-               dt = strength_time - time;
-               if(dt > 0)
-               {
-                       if(dt < 5)
-                       {
-                               drawpic_expanding_two(pos, "gfx/hud/sb_str", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,
-                                       bound(0, (ceil(dt) - dt) / 0.5, 1));
-                       }
-                       else
-                       {
-                               drawpic(pos, "gfx/hud/sb_str", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE);
-                       }
-                       Sbar_DrawXNum(pos - '40 -2 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-               }
-               else if(dt > -1)
-               {
-                       drawpic_expanding(pos, "gfx/hud/sb_str", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,
-                               bound(0, -dt / 0.5, 1));
-               }
-       }
-
-       //invincibility
-       if (invincibility_time) {
-               dt = invincibility_time - time;
-               if(dt > 0)
-               {
-                       if(dt < 5)
-                       {
-                               drawpic_expanding_two(pos - '0 -22 0', "gfx/hud/sb_invinc", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,
-                                       bound(0, (ceil(dt) - dt) / 0.5, 1));
-                       }
-                       else
-                       {
-                               drawpic(pos - '0 -22 0', "gfx/hud/sb_invinc", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE);
-                       }
-                       Sbar_DrawXNum(pos - '40 -24 0', ceil(dt), 2, 0, countdown_fontsize, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-               }
-               else if(dt > -1)
-               {
-                       drawpic_expanding(pos - '0 -22 0', "gfx/hud/sb_invinc", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,
-                               bound(0, -dt / 0.5, 1));
-               }
-       }
-}
-
-#define CENTERPRINT_MAX_LINES 30
-string centerprint_messages[CENTERPRINT_MAX_LINES];
-float centerprint_width[CENTERPRINT_MAX_LINES];
-vector centerprint_start;
-float centerprint_expire;
-float centerprint_num;
-float centerprint_offset_hint;
-vector centerprint_fontsize;
-
-void centerprint(string strMessage)
-{
-       float i, j, n, hcount;
-       string s;
-
-       centerprint_fontsize = Sbar_GetFontsize("scr_centersize");
-
-       centerprint_expire = min(centerprint_expire, time); // if any of the returns happens, this message will fade out
-
-       if(cvar("scr_centertime") <= 0)
-               return;
-
-       if(strMessage == "")
-               return;
-
-       // strip trailing newlines
-       j = strlen(strMessage) - 1;
-       while(substring(strMessage, j, 1) == "\n" && j >= 0)
-               j = j - 1;
-       strMessage = substring(strMessage, 0, j + 1);
-
-       if(strMessage == "")
-               return;
-
-       // strip leading newlines and remember them, they are a hint that the message should be lower on the screen
-       j = 0;
-       while(substring(strMessage, j, 1) == "\n" && j < strlen(strMessage))
-               j = j + 1;
-       strMessage = substring(strMessage, j, strlen(strMessage) - j);
-       centerprint_offset_hint = j;
-
-       if(strMessage == "")
-               return;
-
-       // if we get here, we have a message. Initialize its height.
-       centerprint_num = 0;
-
-       n = tokenizebyseparator(strMessage, "\n");
-       i = hcount = 0;
-       for(j = 0; j < n; ++j)
-       {
-               getWrappedLine_remaining = argv(j);
-               while(getWrappedLine_remaining)
-               {
-                       s = getWrappedLine(vid_conwidth * 0.75, centerprint_fontsize, stringwidth_colors);
-                       if(centerprint_messages[i])
-                               strunzone(centerprint_messages[i]);
-                       centerprint_messages[i] = strzone(s);
-                       centerprint_width[i] = stringwidth(s, TRUE, centerprint_fontsize);
-                       ++i;
-
-                       // half height for empty lines looks better
-                       if(s == "")
-                               hcount += 0.5;
-                       else
-                               hcount += 1;
-
-                       if(i >= CENTERPRINT_MAX_LINES)
-                               break;
-               }
-       }
-
-       float h, havail;
-       h = centerprint_fontsize_y*hcount;
-
-       havail = vid_conheight;
-       if(cvar("con_chatpos") < 0)
-               havail -= (-cvar("con_chatpos") + cvar("con_chat")) * cvar("con_chatsize"); // avoid overlapping chat
-       if(havail > vid_conheight - 70)
-               havail = vid_conheight - 70; // avoid overlapping HUD
-
-       centerprint_start_x = 0;
-
-#if 0
-       float forbiddenmin, forbiddenmax, allowedmin, allowedmax, preferred;
-
-       // here, the centerprint would cover the crosshair. REALLY BAD.
-       forbiddenmin = vid_conheight * 0.5 - h - 16;
-       forbiddenmax = vid_conheight * 0.5 + 16;
-
-       allowedmin = scoreboard_bottom;
-       allowedmax = havail - h;
-       preferred = (havail - h)/2;
-
-
-       // possible orderings (total: 4! / 4 = 6)
-       //  allowedmin allowedmax forbiddenmin forbiddenmax
-       //  forbiddenmin forbiddenmax allowedmin allowedmax
-       if(allowedmax < forbiddenmin || allowedmin > forbiddenmax)
-       {
-               // forbidden doesn't matter in this case
-               centerprint_start_y = bound(allowedmin, preferred, allowedmax);
-       }
-       //  allowedmin forbiddenmin allowedmax forbiddenmax
-       else if(allowedmin < forbiddenmin && allowedmax < forbiddenmax)
-       {
-               centerprint_start_y = bound(allowedmin, preferred, forbiddenmin);
-       }
-       //  allowedmin forbiddenmin forbiddenmax allowedmax
-       else if(allowedmin < forbiddenmin)
-       {
-               // make sure the forbidden zone is not covered
-               if(preferred > (forbiddenmin + forbiddenmax) * 0.5)
-                       centerprint_start_y = bound(allowedmin, preferred, forbiddenmin);
-               else
-                       centerprint_start_y = bound(forbiddenmax, preferred, allowedmin);
-       }
-       //  forbiddenmin allowedmin allowedmax forbiddenmax
-       else if(allowedmax < forbiddenmax)
-       {
-               // it's better to leave the allowed zone (overlap with scoreboard) than
-               // to cover the forbidden zone (crosshair)
-               if(preferred > (forbiddenmin + forbiddenmax) * 0.5)
-                       centerprint_start_y = forbiddenmax;
-               else
-                       centerprint_start_y = forbiddenmin;
-       }
-       //  forbiddenmin allowedmin forbiddenmax allowedmax
-       else
-       {
-               centerprint_start_y = bound(forbiddenmax, preferred, allowedmax);
-       }
-#else
-       centerprint_start_y =
-               min(
-                       max(
-                               max(scoreboard_bottom, vid_conheight * 0.5 + 16),
-                               (havail - h)/2
-                       ),
-                       havail - h
-               );
-#endif
-
-       centerprint_num = i;
-       centerprint_expire = time + cvar("scr_centertime");
-}
-
-void Sbar_DrawCenterPrint (void)
-{
-       float i;
-       vector pos;
-       string ts;
-       float a;
-
-       //if(time > centerprint_expire)
-       //      return;
-
-       //a = bound(0, 1 - 2 * (time - centerprint_expire), 1);
-       a = bound(0, 1 - 4 * (time - centerprint_expire), 1);
-       //sz = 1.2 / (a + 0.2);
-
-       if(a <= 0)
-               return;
-
-       pos = centerprint_start;
-       for (i=0; i<centerprint_num; i = i + 1)
-       {
-               pos_x = (vid_conwidth - centerprint_width[i]) * 0.5;
-               ts = centerprint_messages[i];
-               if (ts != "")
-               {
-                       dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
-                       drawcolorcodedstring(pos, ts, centerprint_fontsize, a, DRAWFLAG_NORMAL);
-                       //  - '0 0.5 0' * (sz - 1) * centerprint_fontsize_x - '0.5 0 0' * (sz - 1) * centerprint_width[i] * centerprint_fontsize_y, centerprint_fontsize * sz
-                       pos_y = pos_y + centerprint_fontsize_y;
-               }
-               else
-                       // half height for empty lines looks better
-                       pos_y = pos_y + centerprint_fontsize_y * 0.5;
-       }
-}
-
-vector Sbar_DrawNoteLine(vector offset, string s)
-{
-       dummyfunction(0, 0, 0, 0, 0, 0, 0, 0); // work around DP bug (set OFS_PARAM5 to 0)
-       drawcolorcodedstring(
-               offset - '1 0 0' * stringwidth(s, TRUE, sbar_fontsize),
-               s,
-               sbar_fontsize,
-               sbar_alpha_fg,
-               0
-       );
-       return offset + sbar_fontsize_y * '0 1 0';
-}
-
-void Sbar_DrawPressedKeys(void)
-{
-       vector pos, bgsize;
-       float pressedkeys;
-
-       pos = stov(cvar_string("cl_showpressedkeys_position"));
-
-       bgsize = '126 75 0';
-
-       pos = '1 0 0' * (vid_conwidth - bgsize_x) * pos_x
-           + '0 1 0' * (vid_conheight - bgsize_y) * pos_y;
-       pos -= '-15 -6 0'; // adjust to the origin of these numbers
-
-       pressedkeys = getstatf(STAT_PRESSED_KEYS);
-       drawpic(pos + '-15   -6   0', "gfx/hud/keys/key_bg.tga",           bgsize, '1 1 1', 0.1 * sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + ' 83.5  9   0', ((pressedkeys & KEY_CROUCH) ? "gfx/hud/keys/key_crouch_inv.tga" : "gfx/hud/keys/key_crouch.tga"), ' 24 24 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + ' 32   -1.5 0', ((pressedkeys & KEY_FORWARD) ? "gfx/hud/keys/key_forward_inv.tga" : "gfx/hud/keys/key_forward.tga"),  ' 32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + '-11.5  9   0', ((pressedkeys & KEY_JUMP) ? "gfx/hud/keys/key_jump_inv.tga" : "gfx/hud/keys/key_jump.tga"),     ' 24 24 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + ' -1   32   0', ((pressedkeys & KEY_LEFT) ? "gfx/hud/keys/key_left_inv.tga" : "gfx/hud/keys/key_left.tga"),     ' 32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + ' 32   32   0', ((pressedkeys & KEY_BACKWARD) ? "gfx/hud/keys/key_backward_inv.tga" : "gfx/hud/keys/key_backward.tga"), ' 32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawpic(pos + ' 65   32   0', ((pressedkeys & KEY_RIGHT) ? "gfx/hud/keys/key_right_inv.tga" : "gfx/hud/keys/key_right.tga"),    ' 32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-}
-
-void Sbar_ShowSpeed(void)
-{
-       vector numsize;
-       float pos, conversion_factor;
-       string speed, zspeed, unit;
-
-       switch(cvar("cl_showspeed_unit"))
-       {
-               default:
-               case 0:
-                       unit = "";
-                       conversion_factor = 1.0;
-                       break;
-               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;
-       }
-
-       speed = strcat(ftos(floor( vlen(pmove_vel - pmove_vel_z * '0 0 1') * conversion_factor + 0.5 )), unit);
-
-       numsize_x = numsize_y = cvar("cl_showspeed_size");
-       pos = (vid_conheight - numsize_y) * cvar("cl_showspeed_position");
-       
-       drawfont = sbar_bigfont;
-       drawstringcenter('1 0 0' + pos * '0 1 0', speed, numsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-       if (cvar("cl_showspeed_z") == 1) {
-               zspeed = strcat(ftos(fabs(floor( pmove_vel_z * conversion_factor + 0.5 ))), unit);
-               drawstringcenter('1 0 0' + pos * '0 1 0' + numsize_y * '0 1 0', zspeed, numsize * 0.5, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       }
-
-       drawfont = sbar_font;
-}
-
-vector acc_prevspeed;
-float acc_prevtime;
-float acc_avg;
-
-void Sbar_ShowAcceleration(void)
-{
-       float acceleration, sz, scale, alpha, f;
-       vector pos, top, rgb;
-       top_x = vid_conwidth/2;
-       top_y = 0;
-
-       f = time - acc_prevtime;
-       if(cvar("cl_showacceleration_z"))
-               acceleration = (vlen(pmove_vel) - vlen(acc_prevspeed)) * (1 / f);
-       else
-               acceleration = (vlen(pmove_vel - '0 0 1' * pmove_vel_z) - vlen(acc_prevspeed - '0 0 1' * acc_prevspeed_z)) * (1 / f);
-       acc_prevspeed = pmove_vel;
-       acc_prevtime = time;
-
-       f = bound(0, f * 10, 1);
-       acc_avg = acc_avg * (1 - f) + acceleration * f;
-       acceleration = acc_avg / getstatf(STAT_MOVEVARS_MAXSPEED);
-
-       pos = top - sz/2 * '0 1 0' + (cvar("cl_showacceleration_position") * vid_conheight) * '0 1 0';
-
-       sz = cvar("cl_showacceleration_size");
-       scale = cvar("cl_showacceleration_scale");
-       alpha = cvar("cl_showacceleration_alpha");
-       if (cvar("cl_showacceleration_color_custom"))
-               rgb = stov(cvar_string("cl_showacceleration_color"));
-       else {
-               rgb = '1 1 1';
-               if (acceleration < 0) {
-                       rgb = '1 .5 .5' - '0 .5 .5' * bound(0, -acceleration * 0.2, 1);
-               } else if (acceleration > 0) {
-                       rgb = '.5 1 .5' - '.5 0 .5' * bound(0, +acceleration * 0.2, 1);
-               }
-       }
-               
-       if (acceleration > 0)
-               drawpic(pos, "gfx/hud/accelerometer_gradient", acceleration * scale * '40 0 0' + sz * '0 1 0', rgb, alpha * sbar_alpha_fg, DRAWFLAG_NORMAL);
-       else if (acceleration < 0)
-               drawpic(pos + acceleration * scale * '40 0 0', "gfx/hud/accelerometer_gradient", -acceleration * scale * '40 0 0' + sz * '0 1 0', rgb, alpha * sbar_alpha_fg, DRAWFLAG_NORMAL);
-}
-
-void Sbar_DrawAccuracyStats_Description_Hitscan(vector position)
-{
-       drawstring(position + '0 3 0' * sbar_fontsize_y, "Shots fired:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawstring(position + '0 5 0' * sbar_fontsize_y, "Shots hit:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawstring(position + '0 7 0' * sbar_fontsize_y, "Accuracy:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawstring(position + '0 9 0' * sbar_fontsize_y, "Shots missed:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-}
-
-void Sbar_DrawAccuracyStats_Description_Splash(vector position)
-{
-       drawstring(position + '0 3 0' * sbar_fontsize_y, "Maximum damage:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawstring(position + '0 5 0' * sbar_fontsize_y, "Actual damage:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawstring(position + '0 7 0' * sbar_fontsize_y, "Accuracy:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       drawstring(position + '0 9 0' * sbar_fontsize_y, "Damage wasted:", sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-}
-
-void Sbar_DrawAccuracyStats()
-{
-       float i, count_hitscan, count_splash, row_hitscan, row_splash;  // count is the number of 'colums'
-       float weapon_hit, weapon_damage, weapon_stats;
-       float left_border;  // position where the weapons start, the description is in the border
-       vector fill_colour, fill_size;
-       vector pos;
-       vector border_colour;
-
-       float col_margin = 20;  // pixels between the columns
-       float row_margin = 20;  // pixels between the rows
-
-       fill_size_x = 5 * sbar_fontsize_x;  // width of the background
-       fill_size_y = 10 * sbar_fontsize_y;  // height of the background
-
-       drawfont = sbar_bigfont;
-       pos_x = 0;
-       pos_y = SCOREBOARD_OFFSET;
-       pos_z = 0;
-       drawstringcenter(pos, "Weapon Accuracy", 2 * sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-       left_border = col_margin + 11 * sbar_fontsize_x;
-
-       drawfont = sbar_font;
-
-       if(warmup_stage)
-       {
-               pos_y += 40;
-               if(mod(time, 1) >= 0.4)
-                       drawstringcenter(pos, "Stats are not tracked during warmup stage", sbar_fontsize, '1 1 0', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-               return;
-       }
-
-       if(gametype == GAME_RACE || gametype == GAME_CTS)
-       {
-               pos_y += 40;
-               if(mod(time, 1) >= 0.4)
-                       drawstringcenter(pos, "Stats are not tracked in Race/CTS", sbar_fontsize, '1 1 0', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-               return;
-       }
-
-       float top_border_hitscan = SCOREBOARD_OFFSET + 55;  // position where the hitscan row starts: pixels down the screen
-       Sbar_DrawAccuracyStats_Description_Hitscan('1 0 0' * col_margin + '0 1 0' * top_border_hitscan);
-
-       float top_border_splash = SCOREBOARD_OFFSET + 175;  // position where the splash row starts: pixels down the screen
-       Sbar_DrawAccuracyStats_Description_Splash('1 0 0' * col_margin + '0 1 0' * top_border_splash);
-
-       for(i = WEP_FIRST; i <= WEP_LAST; ++i)
-       {
-               self = get_weaponinfo(i);
-               if not(self.weapons)
-                       continue;
-               weapon_hit = weapon_hits[i-WEP_FIRST];
-               weapon_damage = weapon_fired[i-WEP_FIRST];
-               border_colour = (i == activeweapon) ? '1 1 1' : '0 0 0';  // white or black border
-
-               if (weapon_damage) {
-                       if (self.spawnflags & WEP_TYPE_SPLASH) {
-                               weapon_stats = bound(0, floor(100 * weapon_hit / weapon_damage), 100);
-
-                               fill_colour_x = 1 - 0.015 * weapon_stats;
-                               fill_colour_y = 1 - 0.015 * (100 - weapon_stats);
-
-                               // how the background colour is calculated
-                               // %    red             green   red_2                   green_2
-                               // 0    1               0               1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 10   0.85    0               1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 20   0.70    0               1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 30   0.55    0               1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 40   0.40    0.10    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 50   0.25    0.25    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 60   0.10    0.40    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 70   0               0.55    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 80   0               0.70    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 90   0               0.85    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 100  0               1               1 - % * 0.015   1 - (100 - %) * 0.015
-
-                               if ((left_border + count_splash * (fill_size_x + col_margin) + fill_size_x) >= vid_conwidth)
-                               {
-                                       count_splash = 0;
-                                       ++row_splash;
-                                       Sbar_DrawAccuracyStats_Description_Splash('1 0 0' * col_margin + '0 1 0' * (top_border_splash + row_splash * (fill_size_y + row_margin)));
-                               }
-
-                               pos_x = left_border + count_splash * (fill_size_x + col_margin);
-                               pos_y = top_border_splash + row_splash * (fill_size_y + row_margin);
-
-                               // background
-                               drawpic(pos, "gfx/hud/sb_accuracy", fill_size , fill_colour, sbar_alpha_bg, DRAWFLAG_NORMAL);
-                               drawborderlines(sbar_border_thickness, pos, fill_size, border_colour, sbar_alpha_bg, DRAWFLAG_NORMAL);
-
-                               // the weapon
-                               drawpic(pos, strcat("gfx/hud/inv_weapon", self.netname), '1 0.5 0' * fill_size_x , '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-                               // the amount of shots fired or max damage
-                               drawstringright(pos + '4.5 0 0' * sbar_fontsize_x + '0 3 0' * sbar_fontsize_y, ftos(weapon_damage), sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-                               // the amount of hits or actual damage
-                               drawstringright(pos + '4.5 0 0' * sbar_fontsize_x + '0 5 0' * sbar_fontsize_y, ftos(weapon_hit), sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-                               // the accuracy
-                               drawstringright(pos + '4.5 0 0' * sbar_fontsize_x + '0 7 0' * sbar_fontsize_y, strcat(ftos(weapon_stats),"%"), sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-                               // the amount of shots missed or damage wasted
-                               drawstringright(pos + '4.5 0 0' * sbar_fontsize_x + '0 9 0' * sbar_fontsize_y, ftos(max(0, weapon_damage - weapon_hit)), sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-                               ++count_splash;
-                       } else if (self.spawnflags & WEP_TYPE_HITSCAN) {
-                               weapon_stats = bound(0, floor(100 * weapon_hit / weapon_damage), 100);
-
-                               fill_colour_x = 1 - 0.015 * weapon_stats;
-                               fill_colour_y = 1 - 0.015 * (100 - weapon_stats);
-
-                               // how the background colour is calculated
-                               // %    red             green   red_2                   green_2
-                               // 0    1               0               1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 10   0.850   0               1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 20   0.70    0               1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 30   0.55    0               1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 40   0.40    0.10    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 50   0.25    0.25    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 60   0.10    0.40    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 70   0               0.55    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 80   0               0.70    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 90   0               0.85    1 - % * 0.015   1 - (100 - %) * 0.015
-                               // 100  0               1               1 - % * 0.015   1 - (100 - %) * 0.015
-
-                               if ((left_border + count_hitscan * (fill_size_x + col_margin) + fill_size_x + cvar("stats_right_margin")) >= vid_conwidth)
-                               {
-                                       count_hitscan = 0;
-                                       ++row_hitscan;
-                                       Sbar_DrawAccuracyStats_Description_Hitscan('1 0 0' * col_margin + '0 1 0' * (top_border_hitscan + row_hitscan * (fill_size_y + row_margin)));
-                               }
-
-                               pos_x = left_border + count_hitscan * (fill_size_x + col_margin);
-                               pos_y = top_border_hitscan + row_hitscan * (fill_size_y + row_margin);
-
-                               // background
-                               drawpic(pos, "gfx/hud/sb_accuracy", fill_size , fill_colour, sbar_alpha_bg, DRAWFLAG_NORMAL);
-                               drawborderlines(sbar_border_thickness, pos, fill_size, border_colour, sbar_alpha_bg, DRAWFLAG_NORMAL);
-
-                               // the weapon
-                               drawpic(pos, strcat("gfx/hud/inv_weapon", self.netname), '1 0.5 0' * fill_size_x , '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-                               // the amount of shots fired or max damage
-                               drawstringright(pos + '4.5 0 0' * sbar_fontsize_x + '0 3 0' * sbar_fontsize_y, ftos(weapon_damage), sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-                               // the amount of hits or actual damage
-                               drawstringright(pos + '4.5 0 0' * sbar_fontsize_x + '0 5 0' * sbar_fontsize_y, ftos(weapon_hit), sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-                               // the accuracy
-                               drawstringright(pos + '4.5 0 0' * sbar_fontsize_x + '0 7 0' * sbar_fontsize_y, strcat(ftos(weapon_stats),"%"), sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-                               // the amount of shots missed or damage wasted
-                               drawstringright(pos + '4.5 0 0' * sbar_fontsize_x + '0 9 0' * sbar_fontsize_y, ftos(max(0, weapon_damage - weapon_hit)), sbar_fontsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-                               ++count_hitscan;
-                       }
-               }
-       }
-}
-
-void drawstringright(vector position, string text, vector scale, vector rgb, float alpha, float flag)
-{
-       position_x -= 2 / 3 * strlen(text) * scale_x;
-       drawstring(position, text, scale, rgb, alpha, flag);
-}
-
-void drawstringcenter(vector position, string text, vector scale, vector rgb, float alpha, float flag)
-{
-       position_x = 0.5 * (vid_conwidth - 0.6025 * strlen(text) * scale_x);
-       drawstring(position, text, scale, rgb, alpha, flag);
-}
-
-float GetAmmoStat(float i)
-{
-       switch(i)
-       {
-               case 0: return STAT_SHELLS;
-               case 1: return STAT_NAILS;
-               case 2: return STAT_ROCKETS;
-               case 3: return STAT_CELLS;
-               case 4: return STAT_FUEL;
-               default: return -1;
-       }
-}
-
-float GetAmmoItemCode(float i)
-{
-       switch(i)
-       {
-               case 0: return IT_SHELLS;
-               case 1: return IT_NAILS;
-               case 2: return IT_ROCKETS;
-               case 3: return IT_CELLS;
-               case 4: return IT_FUEL;
-               default: return -1;
-       }
-}
-
-string GetAmmoPicture(float i)
-{
-       switch(i)
-       {
-               case 0: return "gfx/hud/sb_shells";
-               case 1: return "gfx/hud/sb_bullets";
-               case 2: return "gfx/hud/sb_rocket";
-               case 3: return "gfx/hud/sb_cells";
-               case 4: return "gfx/hud/sb_fuel";
-               default: return "";
-       }
-}
-
-void Sbar_Reset (void)
-{
-       // reset gametype specific icons
-       if(gametype == GAME_KEYHUNT)
-               CSQC_kh_hudreset();
-       else if(gametype == GAME_CTF)
-               CSQC_ctf_hudreset();
-}
-
-float vote_yescount;
-float vote_nocount;
-float vote_needed;
-float vote_highlighted; // currently selected vote
-
-float vote_active; // is there an active vote?
-float vote_prev; // previous state of vote_active to check for a change
-float vote_alpha;
-float vote_change; // "time" when vote_active changed
-
-void Sbar_Draw (void)
-{
-       // vectors for top right, bottom right, bottom and bottom left corners
-       vector topright;
-       vector bottom;
-       vector bottomright;
-       vector bottomleft;
-
-       topright_x = vid_conwidth;
-       topright_y = 0;
-       topright_z = 0;
-
-       bottom_x = vid_conwidth/2;
-       bottom_y = vid_conheight;
-       bottom_z = 0;
-
-       bottomright_x = vid_conwidth;
-       bottomright_y = vid_conheight;
-       bottomright_z = 0;
-
-       bottomleft_x = 0;
-       bottomleft_y = vid_conheight;
-       bottomleft_z = 0;
-
-       sbar_alpha_bg = cvar("sbar_alpha_bg") * (1 - cvar("_menu_alpha"));
-       sbar_border_thickness = bound(0, cvar("sbar_border_thickness"), 5);
-       sbar_accuracy_border_thickness = bound(0, cvar_or("sbar_accuracy_border_thickness", 1), 5);
-       sbar_color_bg_team = cvar("sbar_color_bg_team");
-
-       float i;
-       float weapon_stats;
-       float x, fade;
-       float stat_items, stat_weapons;
-
-       weapon_stats = getstati(STAT_DAMAGE_HITS);
-       weapon_number = weapon_stats & 63;
-       weapon_hits[weapon_number-WEP_FIRST] = floor(weapon_stats / 64);
-
-       weapon_stats = getstati(STAT_DAMAGE_FIRED);
-       weapon_number = weapon_stats & 63;
-       weapon_fired[weapon_number-WEP_FIRST] = floor(weapon_stats / 64);
-
-       vector o; o = '1 0 0' * vid_conwidth;
-       o_y = 28; // move spectator text slightly down to prevent overlapping the timer
-
-       string s;
-       vector pos;
-       pos = '0 0 0';
-
-       sbar_fontsize = Sbar_GetFontsize("sbar_fontsize");
-       sbar_fontsize_spec = Sbar_GetFontsize("sbar_fontsize_spec");
-       if(sbar_fontsize != sbar_oldfontsize)
-       {
-               Cmd_Sbar_SetFields(0);
-               sbar_oldfontsize = sbar_fontsize;
-       }
-
-       if(spectatee_status && !intermission)
-       {
-               drawfont = sbar_bigfont;
-               if(spectatee_status == -1)
-                       s = "^1Observing";
-               else
-                       s = GetPlayerName(spectatee_status - 1);
-               // spectated player name between HUD and chat area, aligned to the left
-               pos_x = bottomleft_x;
-               pos_y = bottom_y - 50 - sbar_fontsize_spec_y;
-               s = textShortenToWidth(s, vid_conwidth/2.5, sbar_fontsize_spec, stringwidth_colors);
-               drawcolorcodedstring(pos, s, sbar_fontsize_spec, sbar_alpha_fg, DRAWFLAG_NORMAL);
-               drawfont = sbar_font;
-
-               // spectator text in the upper right corner
-               if(spectatee_status == -1)
-                       s = strcat("^1Press ^3", getcommandkey("primary fire", "+attack"), "^1 to spectate");
-               else
-                       s = strcat("^1Press ^3", getcommandkey("primary fire", "+attack"), "^1 for another player");
-               o = Sbar_DrawNoteLine(o, s);
-
-               if(spectatee_status == -1)
-                       s = strcat("^1Use ^3", getcommandkey("next weapon", "weapnext"), "^1 or ^3", getcommandkey("previous weapon", "weapprev"), "^1 to change the speed");
-               else
-                       s = strcat("^1Press ^3", getcommandkey("secondary fire", "+attack2"), "^1 to observe");
-               o = Sbar_DrawNoteLine(o, s);
-
-               s = strcat("^1Press ^3", getcommandkey("server info", "+show_info"), "^1 for gamemode info");
-               o = Sbar_DrawNoteLine(o, s);
-
-               if(gametype == GAME_ARENA)
-                       s = "^1Wait for your turn to join";
-               else if(gametype == GAME_LMS)
-               {
-                       entity sk;
-                       sk = playerslots[player_localentnum - 1];
-                       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 = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join");
-               }
-               else
-                       s = strcat("^1Press ^3", getcommandkey("jump", "+jump"), "^1 to join");
-               o = Sbar_DrawNoteLine(o, 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 = strcat("^1Game starts in ^3", ftos(countdown), "^1 seconds");
-                       o = Sbar_DrawNoteLine(o, s);
-               }
-       }
-       if(warmup_stage && !intermission)
-       {
-               s = "^2Currently in ^1warmup^2 stage!";
-               o = Sbar_DrawNoteLine(o, s);
-       }
-
-       // move more important stuff more to the middle so its more visible
-       o_y = vid_conheight * 0.66;
-
-       string blinkcolor;
-       if(mod(time, 1) >= 0.5)
-               blinkcolor = "^1";
-       else
-               blinkcolor = "^3";
-
-       if(ready_waiting && !intermission && !spectatee_status)
-       {
-               if(ready_waiting_for_me)
-               {
-                       if(warmup_stage)
-                               s = strcat(blinkcolor, "Press ^3", getcommandkey("ready", "ready"), blinkcolor, " to end warmup");
-                       else
-                               s = strcat(blinkcolor, "Press ^3", getcommandkey("ready", "ready"), blinkcolor, " once you are ready");
-               }
-               else
-               {
-                       if(warmup_stage)
-                               s = strcat("^2Waiting for others to ready up to end warmup...");
-                       else
-                               s = strcat("^2Waiting for others to ready up...");
-               }
-               o = Sbar_DrawNoteLine(o, s);
-       }
-       else if(warmup_stage && !intermission && !spectatee_status)
-       {
-               s = strcat("^2Press ^3", getcommandkey("ready", "ready"), "^2 to end warmup");
-               o = Sbar_DrawNoteLine(o, s);
-       }
-
-       if(teamplay && !intermission && !spectatee_status && gametype != GAME_CA && teamnagger)
-       {
-               entity tm;
-               float ts_min, ts_max;
-               tm = teams.sort_next;
-               if (tm)
-               {
-                       for(; tm.sort_next; tm = tm.sort_next)
-                       {
-                               if(!tm.team_size || tm.team == COLOR_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 != COLOR_SPECTATOR)
-                               if (tm.team_size == ts_max)
-                                       s = strcat(s, " Press ^3", getcommandkey("team menu", "menu_showteamselect"), blinkcolor, " to adjust");
-
-                               o = Sbar_DrawNoteLine(o, s);
-                       }
-               }
-       }
-
-       if(vote_active != vote_prev) {
-               vote_change = time;
-               vote_prev = bound(0, vote_active, 1);
-       }
-
-       if(vote_active)
-               vote_alpha = bound(0, (time - vote_change) * 2, 1);
-       else
-               vote_alpha = bound(0, 1 - (time - vote_change) * 2, 1);
-
-       if(vote_alpha) {
-               float a;
-               a = vote_alpha * bound(cvar_or("sbar_vote_alreadyvoted_alpha", 0.75), 1 - vote_highlighted, 1);
-
-               if (teamplay)
-                       color =  GetTeamRGB(myteam) * sbar_color_bg_team;
-               else {
-                       color_x = cvar("sbar_color_bg_r");
-                       color_y = cvar("sbar_color_bg_g");
-                       color_z = cvar("sbar_color_bg_b");
-               }
-
-               vector voteorigin = bottomright - '290 135 0';
-               vector votesize = '280 70 0';
-               drawpic(voteorigin, "gfx/hud/voteprogress_back", votesize, color, a * sbar_alpha_bg, DRAWFLAG_NORMAL);
-
-               s = "A vote has been called for: ";
-               drawstring(voteorigin + '0.5 0 0' * votesize_x + '0 0.1 0' * votesize_y - '1 0 0' * stringwidth(s, FALSE, '6 0 0'), s, '12 12 0', '1 1 1', a * sbar_alpha_fg, DRAWFLAG_NORMAL);
-               s = textShortenToWidth(vote_called_vote, votesize_x * 0.96, '10 0 0', stringwidth_colors);
-               drawcolorcodedstring(voteorigin + '0.52 0 0' * votesize_x + '0 0.3 0' * votesize_y - '1 0 0' * stringwidth(s, FALSE, '5 0 0'), s, '10 10 0', a * sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-               // print the yes/no counts
-               s = strcat("Yes: ", ftos(vote_yescount));
-               drawstring(voteorigin + '0 0.6 0' * votesize_y + '0.02 0 0' * votesize_x, s, '12 12 0', '0 1 0', a * sbar_alpha_fg, DRAWFLAG_NORMAL);
-               s = strcat("No: ", ftos(vote_nocount));
-               drawstring(voteorigin + '0 0.6 0' * votesize_y + '0.98 0 0' * votesize_x - '1 0 0' * stringwidth(s, FALSE, '12 0 0'), s, '12 12 0', '1 0 0', a * sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-               // draw the progress bars
-               drawsetcliparea(voteorigin_x, voteorigin_y, votesize_x * 0.5 * (vote_yescount/vote_needed), votesize_y);
-               drawpic(voteorigin, "gfx/hud/voteprogress_prog", votesize, '0 1 0', a * sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-               drawsetcliparea(voteorigin_x + votesize_x - votesize_x * 0.5 * (vote_nocount/vote_needed), voteorigin_y, votesize_x * 0.5, votesize_y);
-               drawpic(voteorigin, "gfx/hud/voteprogress_prog", votesize, '1 0 0', a * sbar_alpha_fg, DRAWFLAG_NORMAL);
-
-               // draw the highlights
-               if(vote_highlighted == 1) {
-                       drawsetcliparea(voteorigin_x, voteorigin_y, votesize_x * 0.5, votesize_y);
-                       drawpic(voteorigin, "gfx/hud/voteprogress_voted", votesize, '0 1 0', a * sbar_alpha_fg, DRAWFLAG_NORMAL);
-               }
-               else if(vote_highlighted == 2) {
-                       drawsetcliparea(voteorigin_x + 0.5 * votesize_x, voteorigin_y, votesize_x * 0.5, votesize_y);
-                       drawpic(voteorigin, "gfx/hud/voteprogress_voted", votesize, '1 0 0', a * sbar_alpha_fg, DRAWFLAG_NORMAL);
-               }
-
-               drawresetcliparea();
-       }
-       else if(!vote_active) {
-               vote_highlighted = 0;
-       }
-
-       Sbar_UpdatePlayerTeams();
-       if (intermission == 2) // map voting screen
-       {
-               if(sb_showaccuracy && spectatee_status != -1) {
-                       Sbar_DrawAccuracyStats();
-                       Sbar_Score();
-                       Sbar_Timer();
-               }
-               else if(sb_showscores) {
-                       Sbar_DrawScoreboard();
-                        Sbar_Score();
-                        Sbar_Timer();
-                }
-               else
-                       Sbar_FinaleOverlay();
-
-               Sbar_Reset();
-       }
-       else if (sb_showscores_force || getstati(STAT_HEALTH) <= 0 || intermission == 1)
-       {
-               if(sb_showaccuracy && spectatee_status != -1)
-                       Sbar_DrawAccuracyStats();
-               else
-                       Sbar_DrawScoreboard();
-               Sbar_Score();
-               Sbar_Timer();
-
-               Sbar_Reset();
-       }
-       else
-       {
-               if(sb_showaccuracy && spectatee_status != -1)
-                       Sbar_DrawAccuracyStats();
-               else
-                       Sbar_DrawScoreboard();
-               float armor, health;
-               armor = getstati(STAT_ARMOR);
-               health = getstati(STAT_HEALTH);
-
-               stat_items = getstati(STAT_ITEMS);
-               stat_weapons = getstati(STAT_WEAPONS);
-
-               fade = 3.2 - 2 * (time - weapontime);
-               fade = bound(0.7, fade, 1);
-
-               vector bg_size; // hud background size
-               bg_size = '1600 58 0';
-
-               if (cvar("viewsize") <= 100 && vid_conwidth <= 1600) {
-                       if (teamplay)
-                               drawpic(bottom - '800 58 0', "gfx/hud/sbar", bg_size, GetTeamRGB(myteam) * sbar_color_bg_team, sbar_alpha_bg, DRAWFLAG_NORMAL); // hud color = myteam color
-                       else {
-                               // allow for custom HUD colors in non-teamgames
-                               color_x = cvar("sbar_color_bg_r");
-                               color_y = cvar("sbar_color_bg_g");
-                               color_z = cvar("sbar_color_bg_b");
-
-                               drawpic(bottom - '800 58 0', "gfx/hud/sbar", bg_size, color, sbar_alpha_bg, DRAWFLAG_NORMAL);
-                       }
-               }
-
-               if(sbar_hudselector == 2) // combined health and armor display
-               {
-                       vector v;
-                       v = healtharmor_maxdamage(health, armor, armorblockpercent);
-
-                       vector num_pos;
-                       num_pos = bottom - '96 28 0';
-
-                       x = floor(v_x + 1);
-
-                       if(v_z) // fully armored
-                       {
-                               // here, armorideal > armor
-                               drawpic(num_pos + '78 -4.5 0', "gfx/hud/sb_health", '32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-                               drawpic(num_pos + '108 -4.5 0', "gfx/hud/sb_armor", '20 20 0', '1 1 1', sbar_alpha_fg * armor / v_y, DRAWFLAG_NORMAL);
-                       }
-                       else
-                       {
-                               drawpic(num_pos + '108 -4.5 0', "gfx/hud/sb_health", '20 20 0', '1 1 1', sbar_alpha_fg * v_y / armor, DRAWFLAG_NORMAL);
-                               drawpic(num_pos + '78 -4.5 0', "gfx/hud/sb_armor", '32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-                       }
-                       Sbar_DrawXNum_Colored(num_pos, x, 24, sbar_alpha_fg); // draw the combined health and armor
-               }
-
-               else
-               {
-                       vector health_pos, armor_pos;
-
-                       if (sbar_hudselector == 0) { // old style layout with armor left of health
-                               armor_pos = bottom - '96 28 0';
-                               health_pos = bottom - '-14 28 0';
-                       }
-                       else {
-                               health_pos = bottom - '96 28 0';                                
-                               armor_pos = bottom - '-14 28 0';
-                       }
-
-                       // armor
-                       x = armor;
-                       if (x > 0)
-                       {
-                               if (x > 45) {
-                                       drawpic(armor_pos + '78 -4.5 0', "gfx/hud/sb_armor", '32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-                                       Sbar_DrawXNum_Colored(armor_pos, x, 24, sbar_alpha_fg);
-                               }
-                               else {
-                                       drawpic(armor_pos + '78 -4.5 0', "gfx/hud/sb_armor", '32 32 0', '1 1 1', (x+10)/55 * sbar_alpha_fg, DRAWFLAG_NORMAL);
-                                       Sbar_DrawXNum_Colored(armor_pos, x, 24, sbar_alpha_fg);
-                               }
-                       }
-
-                       // health
-                       x = health;
-                       drawpic(health_pos + '78 -4.5 0', "gfx/hud/sb_health", '32 32 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-                       Sbar_DrawXNum_Colored(health_pos, x, 24, sbar_alpha_fg);
-               }
-
-               // ammo
-
-               for (i = 0; i < 4; ++i) {
-                       a = getstati(GetAmmoStat(i)); // how much ammo do we have of type i?
-
-                       if(sbar_currentammo || vid_conwidth < 800) { // force showing current ammo only with conwidths < 800
-                               if (stat_items & GetAmmoItemCode(i)) {
-                                       if (vid_conwidth >= 800) {
-                                               pos_x = 230;
-                                               pos_y = 40;
-                                       } else {
-                                               pos_x = 206;
-                                               pos_y = 33;
-                                       }
-
-                                       pos = bottom - pos;
-                                       if(vid_conwidth >= 800)
-                                               drawpic(pos + '0 1.5 0', "gfx/hud/sb_ammobg", '107 29 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-                                       drawpic(pos + '76 3 0', GetAmmoPicture(i), '24 24 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-                                       if(a < 10)
-                                               Sbar_DrawXNum(pos + '5 5 0', a, 3, 0, 24, '0.7 0 0', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-                                       else
-                                               Sbar_DrawXNum(pos + '5 5 0', a, 3, 0, 24, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-                               }
-                       } else {
-                               if (a > 0) {
-                                       switch (i) {
-                                               case 0: pos_x = 286; pos_y = 48; break; // shells
-                                               case 1: pos_x = 286; pos_y = 26; break; // bullets
-                                               case 2: pos_x = 200; pos_y = 48; break; // rockets
-                                               case 3: pos_x = 200; pos_y = 26; break; // cells
-                                       }
-
-                                       pos = bottom - pos;
-                                       if (stat_items & GetAmmoItemCode(i))
-                                               drawpic(pos + '0 1.5 0', "gfx/hud/sb_ammobg", '80 22 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-                                       drawpic(pos + '56 3 0', GetAmmoPicture(i), '18 18 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-                                       if (a < 10) {
-                                               if(stat_items & GetAmmoItemCode(i))
-                                                       Sbar_DrawXNum(pos + '6 4.5 0', a, 3, 0, 16, '0.7 0 0', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-                                               else
-                                                       Sbar_DrawXNum(pos + '6 4.5 0', a, 3, 0, 16, '0.7 0 0', 0, 0, sbar_alpha_fg * 0.7, DRAWFLAG_NORMAL);
-                                       } else {
-                                               if(stat_items & GetAmmoItemCode(i))
-                                                       Sbar_DrawXNum(pos + '6 4.5 0', a, 3, 0, 16, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-                                               else
-                                                       Sbar_DrawXNum(pos + '6 4.5 0', a, 3, 0, 16, '0.7 0.7 0.7', 0, 0, sbar_alpha_fg * 0.7, DRAWFLAG_NORMAL);
-                                       }
-                               }
-                       }
-               }
-
-               // fuel ammo
-               a = getstati(GetAmmoStat(4)); // how much fuel do we have?
-
-               if (a > 0) { // if we have fuel, draw the amount
-                       float invincibility_time, dt;
-                       invincibility_time = getstatf(STAT_INVINCIBLE_FINISHED);
-                       dt = invincibility_time - time;
-                       if (vid_conwidth >= 800) {
-                               if (dt > 0) { // if the invincibility timer is active, draw fuel ammo elsewhere
-                                       pos_x = bottom_x + 140;
-                                       pos_y = bottom_y - 72;
-                               }
-                               else { // if the invincibility timer is inactive, draw the fuel ammo there (it's rare to have invincibility + fuel anyway)
-                                       pos_x = bottom_x + 140;
-                                       pos_y = bottom_y - 20;
-                               }
-                       }
-                       else { // draw fuel on top of ammo if vid_conwidth < 800
-                               pos_x = bottom_x - 200;
-                               pos_y = bottom_y - 45;
-                       }
-                       drawpic(pos - '0 2 0' + '52 0 0', GetAmmoPicture(4), '20 20 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-                       if (a > 10)
-                               Sbar_DrawXNum(pos, a, 3, 0, 16, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-                       else
-                               Sbar_DrawXNum(pos, a, 3, 0, 16, '0.7 0 0', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
-               }
-
-               // draw scores and timer
-               Sbar_Score();
-               Sbar_Timer();
-
-               // draw strength/invincibility icon and timer
-               CSQC_Strength_Timer();
-
-               // weapon icons
-                if(cvar_or("sbar_showweaponicons", 1)) {
-                               Sbar_DrawWeapon_Clear();
-                       for(i = WEP_FIRST; i <= WEP_LAST; ++i)
-                       {
-                               self = get_weaponinfo(i);
-                               if(self.weapons)
-                               if(self.impulse >= 0)
-                                       if(stat_weapons & self.weapons)
-                                       Sbar_DrawWeapon(self, fade, (i == activeweapon));
-                       }
-               }
-
-               // draw gametype specific icons
-               if(gametype == GAME_KEYHUNT)
-                       CSQC_kh_hud();
-               else if(gametype == GAME_CTF)
-                       CSQC_ctf_hud();
-               else if(gametype == GAME_NEXBALL)
-                       CSQC_nb_hud();
-               else if(gametype == GAME_CTS || gametype == GAME_RACE)
-                       CSQC_race_hud();
-       }
-       return;
-}
-
-// CTF HUD
-float redflag_prevframe, blueflag_prevframe; // status during previous frame
-float redflag_prevstatus, blueflag_prevstatus; // last remembered status
-float redflag_statuschange_time, blueflag_statuschange_time; // time when the status changed
-
-void CSQC_ctf_hudreset(void)
-{
-       redflag_prevstatus = blueflag_prevstatus = redflag_prevframe = blueflag_prevframe = redflag_statuschange_time = blueflag_statuschange_time = 0;
-}
-
-void CSQC_ctf_hud(void)
-{
-       vector bottomleft, redflag_pos, blueflag_pos, sz;
-       float f; // every function should have that
-       bottomleft_x = 0;
-       bottomleft_y = vid_conheight;
-       bottomleft_z = 0;
-
-       float redflag, blueflag; // current status
-       float redflag_statuschange_elapsedtime, blueflag_statuschange_elapsedtime; // time since the status changed
-       float stat_items;
-
-       stat_items = getstati(STAT_ITEMS);
-       redflag = (stat_items/IT_RED_FLAG_TAKEN) & 3;
-       blueflag = (stat_items/IT_BLUE_FLAG_TAKEN) & 3;
-
-       // when status CHANGES, set old status into prevstatus and current status into status
-       if (redflag != redflag_prevframe)
-       {
-               redflag_statuschange_time = time;
-               redflag_prevstatus = redflag_prevframe;
-               redflag_prevframe = redflag;
-       }
-
-       if (blueflag != blueflag_prevframe)
-       {
-               blueflag_statuschange_time = time;
-               blueflag_prevstatus = blueflag_prevframe;
-               blueflag_prevframe = blueflag;
-       }
-       
-       redflag_statuschange_elapsedtime = time - redflag_statuschange_time;
-       blueflag_statuschange_elapsedtime = time - blueflag_statuschange_time;
-
-       float BLINK_FACTOR = 0.15;
-       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
-       float BLINK_FREQ = 5; // circle frequency, = 2*pi*frequency in hertz
-
-       string red_icon, red_icon_prevstatus;
-       float red_alpha, red_alpha_prevstatus;
-       red_alpha = red_alpha_prevstatus = 1;
-       switch(redflag) {
-               case 1: red_icon = "gfx/hud/sb_flag_red_taken"; break;
-               case 2: red_icon = "gfx/hud/sb_flag_red_lost"; break;
-               case 3: red_icon = "gfx/hud/sb_flag_red_carrying"; red_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;
-               default:
-                       if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM2))
-                               red_icon = "gfx/hud/sb_flag_red_shielded";
-                       else
-                               red_icon = string_null;
-                       break;
-       }
-       switch(redflag_prevstatus) {
-               case 1: red_icon_prevstatus = "gfx/hud/sb_flag_red_taken"; break;
-               case 2: red_icon_prevstatus = "gfx/hud/sb_flag_red_lost"; break;
-               case 3: red_icon_prevstatus = "gfx/hud/sb_flag_red_carrying"; red_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;
-               default:
-                       if(redflag == 3)
-                               red_icon_prevstatus = "gfx/hud/sb_flag_red_carrying"; // make it more visible
-                       else if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM2))
-                               red_icon_prevstatus = "gfx/hud/sb_flag_red_shielded";
-                       else
-                               red_icon_prevstatus = string_null;
-                       break;
-       }
-
-       string blue_icon, blue_icon_prevstatus;
-       float blue_alpha, blue_alpha_prevstatus;
-       blue_alpha = blue_alpha_prevstatus = 1;
-       switch(blueflag) {
-               case 1: blue_icon = "gfx/hud/sb_flag_blue_taken"; break;
-               case 2: blue_icon = "gfx/hud/sb_flag_blue_lost"; break;
-               case 3: blue_icon = "gfx/hud/sb_flag_blue_carrying"; blue_alpha = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;
-               default:
-                       if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM1))
-                               blue_icon = "gfx/hud/sb_flag_blue_shielded";
-                       else
-                               blue_icon = string_null;
-                       break;
-       }
-       switch(blueflag_prevstatus) {
-               case 1: blue_icon_prevstatus = "gfx/hud/sb_flag_blue_taken"; break;
-               case 2: blue_icon_prevstatus = "gfx/hud/sb_flag_blue_lost"; break;
-               case 3: blue_icon_prevstatus = "gfx/hud/sb_flag_blue_carrying"; blue_alpha_prevstatus = BLINK_BASE + BLINK_FACTOR * cos(time * BLINK_FREQ); break;
-               default:
-                       if(blueflag == 3)
-                               blue_icon_prevstatus = "gfx/hud/sb_flag_blue_carrying"; // make it more visible
-                       else if((stat_items & IT_CTF_SHIELDED) && (myteam == COLOR_TEAM1))
-                               blue_icon_prevstatus = "gfx/hud/sb_flag_blue_shielded";
-                       else
-                               blue_icon_prevstatus = string_null;
-                       break;
-       }
-
-       if (myteam == COLOR_TEAM1) { // always draw own flag on left
-               redflag_pos = bottomleft - '-4 50 0';
-               blueflag_pos = bottomleft - '-62 50 0';
-       } else {
-               blueflag_pos = bottomleft - '-4 50 0';
-               redflag_pos = bottomleft - '-62 50 0';
-       }
-       
-       sz = '52 52 0';
-       
-       f = bound(0, redflag_statuschange_elapsedtime*2, 1);
-       if(red_icon_prevstatus && f < 1)
-               drawpic_expanding(redflag_pos, red_icon_prevstatus, sz, '1 1 1', sbar_alpha_fg * red_alpha_prevstatus, DRAWFLAG_NORMAL, f);
-       if(red_icon)
-               drawpic(redflag_pos, red_icon, sz, '1 1 1', sbar_alpha_fg * red_alpha * f, DRAWFLAG_NORMAL);
-
-       f = bound(0, blueflag_statuschange_elapsedtime*2, 1);
-       if(blue_icon_prevstatus && f < 1)
-               drawpic_expanding(blueflag_pos, blue_icon_prevstatus, sz, '1 1 1', sbar_alpha_fg * blue_alpha_prevstatus, DRAWFLAG_NORMAL, f);
-       if(blue_icon)
-               drawpic(blueflag_pos, blue_icon, sz, '1 1 1', sbar_alpha_fg * blue_alpha * f, DRAWFLAG_NORMAL);
-}
-
-// Keyhunt HUD
-float kh_runheretime;
-
-void CSQC_kh_hudreset(void)
-{
-       kh_runheretime = 0;
-}
-
-void CSQC_kh_hud(void)
-{
-       float kh_keys;
-       float keyteam;
-       float a, aa;
-       vector p, pa, kh_size, kh_asize;
-
-       vector bottomleft;
-       bottomleft_x = 0;
-       bottomleft_y = vid_conheight;
-       bottomleft_z = 0;
-
-       p_x = 6;
-       p_y = vid_conheight - 34 - 3;
-       p_z = 0;
-
-       kh_keys = getstati(STAT_KH_KEYS);
-
-       kh_size = '19 34 0';
-       kh_asize = '19 10 0';
-       pa = p + '0 -10 0';
-
-       float i, key;
-
-       float keycount;
-       keycount = 0;
-       for(i = 0; i < 4; ++i)
-       {
-               key = floor(kh_keys / pow(32, i)) & 31;
-               keyteam = key - 1;
-               if(keyteam == 30 && keycount <= 4)
-                       keycount += 4;
-               if(keyteam == myteam || keyteam == -1 || keyteam == 30)
-                       keycount += 1;
-       }
-       // this yields 8 exactly if "RUN HERE" shows
-
-       if(keycount == 8)
-       {
-               if(!kh_runheretime)
-                       kh_runheretime = time;
-               pa_y -= fabs(sin((time - kh_runheretime) * 3.5)) * 6; // make the arrows jump in case of RUN HERE
-       }
-       else
-               kh_runheretime = 0;
-
-       for(i = 0; i < 4; ++i)
-       {
-               key = floor(kh_keys / pow(32, i)) & 31;
-               keyteam = key - 1;
-               switch(keyteam)
-               {
-                       case 30: // my key
-                               keyteam = myteam;
-                               a = 1;
-                               aa = 1;
-                               break;
-                       case -1: // no key
-                               a = 0;
-                               aa = 0;
-                               break;
-                       default: // owned or dropped
-                               a = 0.2;
-                               aa = 0.5;
-                               break;
-               }
-               a = a * sbar_alpha_fg;
-               aa = aa * sbar_alpha_fg;
-               if(a > 0)
-               {
-                       switch(keyteam)
-                       {
-                               case COLOR_TEAM1:
-                                       drawpic (pa, "gfx/hud/sb_kh_redarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                               case COLOR_TEAM2:
-                                       drawpic (pa, "gfx/hud/sb_kh_bluearrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                               case COLOR_TEAM3:
-                                       drawpic (pa, "gfx/hud/sb_kh_yellowarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                               case COLOR_TEAM4:
-                                       drawpic (pa, "gfx/hud/sb_kh_pinkarrow", kh_asize, '1 1 1', aa, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                               default:
-                                       break;
-                       }
-                       switch(i) // YAY! switch(i) inside a for loop for i. DailyWTF, here we come!
-                       {
-                               case 0:
-                                       drawpic (p, "gfx/hud/sb_kh_red", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                               case 1:
-                                       drawpic (p, "gfx/hud/sb_kh_blue", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                               case 2:
-                                       drawpic (p, "gfx/hud/sb_kh_yellow", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                               case 3:
-                                       drawpic (p, "gfx/hud/sb_kh_pink", kh_size, '1 1 1', a, DRAWFLAG_NORMAL);  // show 30% alpha key
-                                       break;
-                       }
-               }
-               p_x += 24;
-               pa_x += 24;
-       }
-}
-
-//Nexball HUD
-#define NBPB_SIZE '96 38 0'
-#define NBPB_BT 2                   //thickness
-#define NBPB_BRGB '1 1 1'
-#define NBPB_BALPH 1                //alpha
-#define NBPB_BFLAG DRAWFLAG_NORMAL
-#define NBPB_IALPH 0.4
-#define NBPB_IFLAG DRAWFLAG_NORMAL
-#define NBPB_IRGB '0.7 0.1 0'
-
-void CSQC_nb_hud(void)
-{
-       float stat_items, nb_pb_starttime, dt, p;
-       vector pos;
-
-       stat_items = getstati(STAT_ITEMS);
-       nb_pb_starttime = getstatf(STAT_NB_METERSTART);
-
-       pos_x = 4;
-       pos_y = vid_conheight - 42;
-       pos_z = 0;
-
-       //Manage the progress bar if any
-       if (nb_pb_starttime > 0)
-       {
-               vector s;
-               dt = mod(time - nb_pb_starttime, nb_pb_period);
-               // one period of positive triangle
-               p = 2 * dt / nb_pb_period;
-               if (p > 1)
-                       p = 2 - p;
-
-               s = NBPB_SIZE;
-               //Draw the filling
-               drawfill(pos, p * s_x * '1 0 0' + s_y * '0 1 0', NBPB_IRGB, NBPB_IALPH, NBPB_IFLAG);
-
-               //Draw the box
-               s = NBPB_SIZE;
-               drawline(NBPB_BT, pos    , pos + '1 0 0' * s_x, NBPB_BRGB, NBPB_BALPH, NBPB_BFLAG);
-               drawline(NBPB_BT, pos    , pos + '0 1 0' * s_y, NBPB_BRGB, NBPB_BALPH, NBPB_BFLAG);
-               drawline(NBPB_BT, pos + s, pos + '1 0 0' * s_x, NBPB_BRGB, NBPB_BALPH, NBPB_BFLAG);
-               drawline(NBPB_BT, pos + s, pos + '0 1 0' * s_y, NBPB_BRGB, NBPB_BALPH, NBPB_BFLAG);
-       }
-
-       pos_x += 12; //horizontal margin to the picture
-       pos_y += 2; //vertical margin to the picture
-
-       if (stat_items & IT_KEY1)
-               drawpic(pos, "gfx/hud/sb_nexball_carrying", '80 34 0', '1 1 1', 1, DRAWFLAG_NORMAL);
-}
-
-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
-void CSQC_race_hud(void) 
-{
-       entity me;
-       me = playerslots[player_localentnum - 1];
-       float t, score;
-       float f; // yet another function has this
-       score = me.(scores[ps_primary]);
-
-       if not((scores_flags[ps_primary] & SFL_TIME) && !teamplay) // race/cts record display on HUD
-               return; // no records in the actual race
-
-       drawfont = sbar_bigfont;
-       vector pos;
-       pos_x = 2;
-       pos_y = vid_conheight - 48;
-
-       // clientside personal record
-       string rr;
-       if(gametype == GAME_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(t != crecordtime_prev) {
-               crecordtime_prev = t;
-               crecordtime_change_time = time;
-       }
-       f = time - crecordtime_change_time;
-
-       if (f > 1) {
-               drawstring(pos, "Personal best ", '10 10 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-               drawstring(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       } else {
-               drawstring(pos, "Personal best ", '10 10 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-               drawstring(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-               drawstring_expanding(pos, "Personal best ", '10 10 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL, f);
-               drawstring_expanding(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL, f);
-       }
-
-       // server record
-       pos_y += 26;
-       t = race_server_record;
-       if(t != srecordtime_prev) {
-               srecordtime_prev = t;
-               srecordtime_change_time = time;
-       }
-       f = time - srecordtime_change_time;
-
-       if (f > 1) {
-               drawstring(pos, "Server best ", '10 10 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-               drawstring(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-       } else {
-               drawstring(pos, "Server best ", '10 10 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-               drawstring(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
-               drawstring_expanding(pos, "Server best ", '10 10 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL, f);
-               drawstring_expanding(pos + '0 10 0', TIME_ENCODED_TOSTRING(t),'14 14 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL, f);
-       }
-       drawfont = sbar_font;
-}
diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
new file mode 100644 (file)
index 0000000..9be58e8
--- /dev/null
@@ -0,0 +1,1519 @@
+float sb_alpha_bg;
+float sb_alpha_fg;
+float sb_highlight;
+float sb_highlight_alpha;
+float sb_highlight_alpha_self;
+float sb_alpha_name;
+float sb_alpha_name_self;
+
+void drawstringright(vector, string, vector, vector, float, float);
+void drawstringcenter(vector, string, vector, vector, float, float);
+
+float SCOREBOARD_OFFSET = 50;
+
+void MapVote_Draw();
+void Sbar_FinaleOverlay()
+{
+       /*vector pos;
+       pos_x = (vid_conwidth - 1)/2;
+       pos_y = 16;
+       pos_z = 0;*/
+
+       //drawpic(pos, "gfx/finale", '0 0 0', '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL);
+
+       //drawstring(pos, "END", sbar_fontsize, '1 1 1', 1, DRAWFLAG_NORMAL);
+       MapVote_Draw();
+}
+
+void Sbar_DrawXNum (vector pos, float num, float digits, float showminusplus, float lettersize, vector rgb, float highlighted, float stroke, float alpha, float dflags)
+{
+       float l, i;
+       string str, tmp, l_length;
+       float minus, plus;
+       vector vsize, num_color;
+
+       vsize_x = vsize_y = lettersize;
+       vsize_z = 0;
+
+       // showminusplus 1: always prefix with minus sign (useful in race distribution display)
+       // showminusplus 2: always prefix with plus sign (useful in race distribution display)
+       // showminusplus 3: prefix with minus sign if negative, plus sign if positive (useful in score distribution display)
+
+       if((showminusplus == 2 && num >= 0) || (num > 0 && showminusplus == 3))
+       {
+               plus = true;
+               pos_x -= lettersize;
+       } else
+               plus = false;
+
+       if(num < 0 || (num < 0 && showminusplus == 3) || (showminusplus == 1 && num <= 0))
+       {
+               minus = true;
+               num = -num;
+               pos_x -= lettersize;
+       } else
+               minus = false;
+
+       if(digits < 0)
+       {
+               tmp = ftos(num);
+               digits = -digits;
+               str = strcat(substring("0000000000", 0, digits - strlen(tmp)), tmp);
+       } else
+               str = ftos(num);
+
+       l = strlen(str);
+       l_length = ftos(l);
+
+       if(l > digits)
+       {
+               str = substring(str, l-digits, 999);
+               l = strlen(str);
+       } else if(l < digits)
+               pos_x += (digits-l) * lettersize;
+
+       if (highlighted == 1) {
+               vector hl_size;
+               hl_size_x = vsize_x * l + vsize_x * 0.2;
+               hl_size_y = vsize_y * 1.1;
+               hl_size_z = 0;
+               if(minus)
+                       hl_size_x = hl_size_x + vsize_x;
+
+               vector hl_pos;
+               hl_pos_x = pos_x - lettersize/10;
+               hl_pos_y = pos_y - lettersize/20;
+               hl_pos_z = 0;
+
+               drawpic(hl_pos, strcat("gfx/hud/sb_highlight_", l_length), hl_size, '1 1 1', alpha, dflags);
+       }
+
+       if (stroke == 1)
+               num_color = '1 1 1';
+       else
+               num_color = rgb;
+
+       if(minus)
+       {
+               if (stroke == 1)
+                       drawpic(pos, "gfx/hud/num_minus_stroke", vsize, rgb, alpha, dflags);
+               drawpic(pos, "gfx/hud/num_minus", vsize, num_color, alpha, dflags);
+               pos_x += lettersize;
+       } else if(plus)
+       {
+               if (stroke == 1)
+                       drawpic(pos, "gfx/hud/num_plus_stroke", vsize, rgb, alpha, dflags);
+               drawpic(pos, "gfx/hud/num_plus", vsize, num_color, alpha, dflags);
+               pos_x += lettersize;
+       }
+
+       for(i = 0; i < l; ++i)
+       {
+               tmp = substring(str, i, 1);
+               if (stroke == 1)
+                       drawpic(pos, strcat("gfx/hud/num_", tmp, "_stroke"), vsize, rgb, alpha, dflags);
+               drawpic(pos, strcat("gfx/hud/num_", tmp), vsize, num_color, alpha, dflags);
+               pos_x += lettersize;
+       }
+}
+
+void Cmd_Sbar_SetFields(float argc);
+void Sbar_InitScores()
+{
+       float i, f;
+
+       ps_primary = ps_secondary = ts_primary = ts_secondary = -1;
+       for(i = 0; i < MAX_SCORE; ++i)
+       {
+               f = (scores_flags[i] & SFL_SORT_PRIO_MASK);
+               if(f == SFL_SORT_PRIO_PRIMARY)
+                       ps_primary = i;
+               if(f == SFL_SORT_PRIO_SECONDARY)
+                       ps_secondary = i;
+       }
+       if(ps_secondary == -1)
+               ps_secondary = ps_primary;
+
+       for(i = 0; i < MAX_TEAMSCORE; ++i)
+       {
+               f = (teamscores_flags[i] & SFL_SORT_PRIO_MASK);
+               if(f == SFL_SORT_PRIO_PRIMARY)
+                       ts_primary = i;
+               if(f == SFL_SORT_PRIO_SECONDARY)
+                       ts_secondary = i;
+       }
+       if(ts_secondary == -1)
+               ts_secondary = ts_primary;
+
+       Cmd_Sbar_SetFields(0);
+}
+
+void Sbar_UpdatePlayerPos(entity pl);
+float SetTeam(entity pl, float Team);
+//float lastpnum;
+void Sbar_UpdatePlayerTeams()
+{
+       float Team;
+       entity pl, tmp;
+       float num;
+
+       num = 0;
+       for(pl = players.sort_next; pl; pl = pl.sort_next)
+       {
+               num += 1;
+               Team = GetPlayerColor(pl.sv_entnum);
+               if(SetTeam(pl, Team))
+               {
+                       tmp = pl.sort_prev;
+                       Sbar_UpdatePlayerPos(pl);
+                       if(tmp)
+                               pl = tmp;
+                       else
+                               pl = players.sort_next;
+               }
+       }
+       /*
+       if(num != lastpnum)
+         &n