More position tweaking

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

diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index e1d8fcace82396eb72672e65a0b6004ad057dd59..c1c4b6c0d8c8c1be088a683472695c6d55d72b38 100644 (file)
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -2903,10 +2903,7 @@ void Sbar_Draw (void)
        Sbar_UpdatePlayerTeams();\r
        if (intermission == 2) // map voting screen\r
        {\r
-               if(spectatee_status != -1) {\r
-                       Sbar_Score();\r
-                       Sbar_Timer();\r
-               }\r
+               Sbar_Timer();\r
                if(sb_showscores)\r
                        Sbar_DrawScoreboard();\r
                else\r
@@ -3028,8 +3025,19 @@ void Sbar_Draw (void)
                        }\r
                }\r
 \r
-               vector health_pos;\r
+               vector health_pos, armor_pos;\r
                health_pos = bottom - '77 58 0';\r
+               armor_pos = bottom - '62 68 0';\r
+\r
+               // armor\r
+               x = armor;\r
+               if (x > 0)\r
+               {\r
+                       drawpic(armor_pos + '10 -13.5 0', "gfx/hud/sb_armor", '16 16 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);\r
+                       if(x < 100) armor_pos_x -= 4.5; // always center\r
+                       if(x < 10) armor_pos_x -= 7; // always center\r
+                       Sbar_DrawXNum_Colored(armor_pos, x, 12, sbar_alpha_fg);\r
+               }\r
 \r
                // health\r
                x = health;\r