Cvar scoreboard offset

[voretournament/voretournament.git] / data / qcsrc / client / sbar.qc

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index 0022a7c11e137cc0a1c0a7b0454d09f141038f5b..a8ba383336698978a9daaf9efd32e96a518bf2cd 100644 (file)
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -29,7 +29,7 @@ float ps_primary, ps_secondary;
 float ts_primary, ts_secondary;\r
 \r
 vector color;\r
-float SCOREBOARD_OFFSET = 50;\r
+float SCOREBOARD_OFFSET = cvar("sbar_scoreboard_offset");\r
 \r
 void CSQC_kh_hudreset();\r
 void CSQC_kh_hud();\r
@@ -716,16 +716,6 @@ string Sbar_GetField(entity pl, float field)
 \r
 string Sbar_GetStomachField(entity pl, float field)\r
 {\r
-       sbar_field_rgb = '1 1 1';\r
-       sbar_field_icon0 = "";\r
-       sbar_field_icon1 = "";\r
-       sbar_field_icon2 = "";\r
-       sbar_field_icon0_rgb = '1 1 1';\r
-       sbar_field_icon1_rgb = '1 1 1';\r
-       sbar_field_icon2_rgb = '1 1 1';\r
-       sbar_field_icon0_alpha = 1;\r
-       sbar_field_icon1_alpha = 1;\r
-       sbar_field_icon2_alpha = 1;\r
        switch(field)\r
        {\r
                case ST_HIGHLIGHT:\r
@@ -743,6 +733,18 @@ string Sbar_GetStomachField(entity pl, float field)
        //return "error";\r
 }\r
 \r
+string Sbar_GetStomachFieldPred(entity pl, float field)\r
+{\r
+       switch(field)\r
+       {\r
+               case STP_NAME:\r
+                       return GetPlayerName(pl.sv_entnum);\r
+               default:\r
+                       return "N/A";\r
+       }\r
+       //return "error";\r
+}\r
+\r
 float xmin, xmax, ymin, ymax, sbwidth;\r
 float sbar_fixscoreboardcolumnwidth_len;\r
 float sbar_fixscoreboardcolumnwidth_iconlen;\r
@@ -961,9 +963,6 @@ void Sbar_PrintStomachboardItem(vector pos, entity pl)
        for(fieldcounter = 1; fieldcounter <= field_number; ++fieldcounter)\r
        {\r
                field = -fieldcounter;\r
-               if(field == SP_SEPARATOR)\r
-                       break;\r
-\r
                str = Sbar_GetStomachField(pl, field);\r
 \r
                // row highlighting\r
@@ -982,7 +981,7 @@ void Sbar_PrintStomachboardItem(vector pos, entity pl)
                        drawpic(pos, "gfx/sb_playercolor_pants", '22 11 0', colormapPaletteColor(mod(f, 16), 1), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 \r
                        pos_x += 24;\r
-                       drawcolorcodedstring(pos, str, '11 11 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+                       drawcolorcodedstring(pos, textShortenToWidth(str, 138, '11 11 0', stringwidth_colors), '11 11 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                }\r
 \r
                if(field == ST_HEALTH)\r
@@ -1013,19 +1012,16 @@ void Sbar_PrintStomachboardItemPred(vector pos, entity pl)
        for(fieldcounter2 = 1; fieldcounter2 <= field_number; ++fieldcounter2)\r
        {\r
                field = -fieldcounter2;\r
-               if(field == SP_SEPARATOR)\r
-                       break;\r
-\r
-               str = Sbar_GetStomachField(pl, field);\r
+               str = Sbar_GetStomachFieldPred(pl, field);\r
 \r
-               if(field == ST_NAME) {\r
+               if(field == STP_NAME) {\r
                        f = stof(getplayerkey(pl.sv_entnum, "colors"));\r
                        drawpic(pos, "gfx/sb_playercolor_base", '22 11 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                        drawpic(pos, "gfx/sb_playercolor_shirt", '22 11 0', colormapPaletteColor(floor(f / 16), 0), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                        drawpic(pos, "gfx/sb_playercolor_pants", '22 11 0', colormapPaletteColor(mod(f, 16), 1), sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 \r
                        pos_x += 24;\r
-                       drawcolorcodedstring(pos, str, '11 11 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+                       drawcolorcodedstring(pos, textShortenToWidth(str, 122, '11 11 0', stringwidth_colors), '11 11 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                }\r
        }\r
 }\r
@@ -2589,7 +2585,7 @@ float GetAmmoStat(float i)
 {\r
        switch(i)\r
        {\r
-               case 1: return STAT_FUEL;\r
+               case 0: return STAT_FUEL;\r
                default: return -1;\r
        }\r
 }\r
@@ -2598,7 +2594,7 @@ float GetAmmoItemCode(float i)
 {\r
        switch(i)\r
        {\r
-               case 1: return IT_FUEL;\r
+               case 0: return IT_FUEL;\r
                default: return -1;\r
        }\r
 }\r
@@ -2607,7 +2603,7 @@ string GetAmmoPicture(float i)
 {\r
        switch(i)\r
        {\r
-               case 1: return "gfx/hud/sb_fuel";\r
+               case 0: return "gfx/hud/sb_fuel";\r
                default: return "";\r
        }\r
 }\r
@@ -3034,18 +3030,36 @@ void Sbar_Draw (void)
                if(x < 10) health_pos_x -= 11; // always center\r
                Sbar_DrawXNum_Colored(health_pos, x, 22, sbar_alpha_fg);\r
 \r
-               // fuel ammo\r
-               a = getstati(GetAmmoStat(1)); // how much fuel do we have?\r
+               // ammo\r
+               pos_x = bottom_x + 140;\r
+               pos_y = bottom_y - 20;\r
 \r
-               if (a > 0) { // if we have fuel, draw the amount\r
-                       float invincibility_time, dt;\r
-                       invincibility_time = getstatf(STAT_INVINCIBLE_FINISHED);\r
-                       dt = invincibility_time - time;\r
-                       pos_x = bottom_x + 140;\r
-                       pos_y = bottom_y - 20;\r
-                       drawpic(pos - '98 18 0', GetAmmoPicture(1), '20 20 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+               // if we are using the jetpack, show fuel ammo. Otherwise show the ammo of our weapon\r
+               if(stat_items & IT_JETPACK && button_jetpack)\r
+               {\r
+                       a = getstati(GetAmmoStat(0)); // how much fuel do we have?\r
+                       drawpic(pos - '98 18 0', GetAmmoPicture(0), '20 20 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                        Sbar_DrawXNum(pos - '144 16 0', a, 3, 0, 16, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                }\r
+               else\r
+               {\r
+                       float i;\r
+                       for (i = 0; i < 1; ++i)\r
+                       {\r
+                               if (stat_items & GetAmmoItemCode(i))\r
+                               {\r
+                                       a = getstati(GetAmmoStat(i)); // how much ammo do we have of type i?\r
+                                       drawpic(pos - '98 18 0', GetAmmoPicture(i), '20 20 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+                                       Sbar_DrawXNum(pos - '144 16 0', a, 3, 0, 16, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+                               }\r
+                       }\r
+               }\r
+\r
+               // weapon icon\r
+               entity e;\r
+               e = get_weaponinfo(activeweapon);\r
+               if (e && e.netname != "" && e.netname != "N/A")\r
+                       drawpic(bottom - '96 96 0', strcat("gfx/hud/bg_status_activeweapon_", e.netname), '192 96 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 \r
                // draw scores and timer\r
                Sbar_Score();\r