X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fclient%2Fsbar.qc;h=c1c4b6c0d8c8c1be088a683472695c6d55d72b38;hb=94dc1fd5093f998152d51948b04a2280c207cd10;hp=c293d80a55d18c926365bdf65a164b676276f9fa;hpb=690eea263bd261ef2358f2347f640f78c2a9e8ce;p=voretournament%2Fvoretournament.git

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