Move two more items to the new HUD system

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

diff --git a/data/qcsrc/client/hud.qc b/data/qcsrc/client/hud.qc
index c70501497f27be29dfbcc88a7dcee9a6d4050a3d..25aa1a8521036fbe58eed95ad21ada7132c5c992 100644 (file)
--- a/data/qcsrc/client/hud.qc
+++ b/data/qcsrc/client/hud.qc
@@ -94,7 +94,7 @@ vector Sbar_ConvertToScreen_TextPosition(string text, vector position, float let
        vector pos, sz;\r
        sz_x = sz_y = lettersize;\r
        pos_x = (vid_conwidth / 2) * bound(0, 1 + position_x, 2);\r
-       pos_x -= stringwidth(text, FALSE, sz) * 0.5;\r
+       pos_x -= stringwidth(text, TRUE, sz) * 0.5;\r
        pos_y = (vid_conheight / 2) * bound(0, 1 - position_y, 2);\r
        pos_y -= sz_y / 2;\r
        return pos;\r
@@ -123,7 +123,7 @@ void Sbar_DrawString(string text, vector position, float lettersize)
        pos = Sbar_ConvertToScreen_TextPosition(text, position, lettersize);\r
        sz_x = sz_y = lettersize;\r
 \r
-       drawstring(pos, text, sz, '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+       drawcolorcodedstring(pos, text, sz, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
 }\r
 \r
 void Sbar_DrawXNum (vector position, float num, float digits, float showminusplus, float lettersize, vector rgb, float alpha, float dflags)\r
@@ -2170,9 +2170,9 @@ void Sbar_Status()
                                {\r
                                        weapon_clipload = getstati(STAT_WEAPON_CLIPLOAD);\r
                                        if(weapon_clipload < 0) // we're reloading\r
-                                               Sbar_DrawString("- -", stov(cvar_string("hud_item_clip_load_text_position")), cvar("hud_item_clip_load_text_scale"));\r
+                                               Sbar_DrawString("- -", stov(cvar_string("hud_item_ammo_load_clip_text_position")), cvar("hud_item_ammo_load_clip_text_scale"));\r
                                        else\r
-                                               Sbar_DrawXNum(stov(cvar_string("hud_item_clip_load_text_position")), weapon_clipload, 2, 0, cvar("hud_item_clip_load_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+                                               Sbar_DrawXNum(stov(cvar_string("hud_item_ammo_load_clip_text_position")), weapon_clipload, 2, 0, cvar("hud_item_ammo_load_clip_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                                        Sbar_DrawXNum(stov(cvar_string("hud_item_ammo_load_text_position")), a, 3, 0, cvar("hud_item_ammo_load_text_scale"), '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
                                }\r
                                else\r
@@ -3278,24 +3278,23 @@ void Sbar_Draw (void)
                        if(stomach_load)\r
                        {\r
                                status_text = strcat(ftos(stomach_load), "^8/", status_color, ftos(stomach_maxload));\r
-                               status_pos = bottomleft - '-43 168 0';\r
-                               status_size = 16;\r
+                               status_pos = stov(cvar_string("hud_item_stomach_load_double_text_position"));\r
+                               status_size = cvar("hud_item_stomach_load_double_text_scale");\r
                        }\r
                        else\r
                        {\r
                                status_text = strcat(status_color, ftos(stomach_maxload));\r
-                               status_pos = bottomleft - '-43 170 0';\r
-                               status_size = 20;\r
+                               status_pos = stov(cvar_string("hud_item_stomach_load_single_text_position"));\r
+                               status_size = cvar("hud_item_stomach_load_single_text_scale");\r
                        }\r
-                       status_pos -= '1 0 0' * stringwidth(status_text, TRUE, '1 0 0' * status_size) * 0.5;\r
-                       drawcolorcodedstring(status_pos, status_text, '1 1 0' * status_size, sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+                       Sbar_DrawString(status_text, status_pos, status_size);\r
 \r
                        if(getstati(STAT_VORE_DIGESTING)) // we are currently digesting\r
-                               drawpic(bottomleft - '-35 149 0', "gfx/hud/sb_digestion", '16 16 0', '0 1 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+                               Sbar_DrawPic("gfx/hud/sb_digestion_active", stov(cvar_string("hud_item_digestion_icon_position")), stov(cvar_string("hud_item_digestion_icon_scale")), FALSE);\r
                        else if(stomach_load) // we can digest at this time\r
-                               drawpic(bottomleft - '-35 149 0', "gfx/hud/sb_digestion", '16 16 0', '0.25 0.25 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+                               Sbar_DrawPic("gfx/hud/sb_digestion_possible", stov(cvar_string("hud_item_digestion_icon_position")), stov(cvar_string("hud_item_digestion_icon_scale")), FALSE);\r
                        else // we cannot digest at this time\r
-                               drawpic(bottomleft - '-35 149 0', "gfx/hud/sb_digestion", '16 16 0', '0.25 0 0', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+                               Sbar_DrawPic("gfx/hud/sb_digestion_impossible", stov(cvar_string("hud_item_digestion_icon_position")), stov(cvar_string("hud_item_digestion_icon_scale")), FALSE);\r
 \r
                        // draw the stomach board player list\r
                        entity pl, pred;\r