From: Mario <mario.mario@y7mail.com>
Date: Sun, 14 Jun 2020 20:18:10 +0000 (+1000)
Subject: Merge branch 'master' into Mario/qc_stats
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5b4dd1bb267836163dec0a6e1709721e645a43aa;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/qc_stats
---

5b4dd1bb267836163dec0a6e1709721e645a43aa
diff --cc qcsrc/client/hud/panel/healtharmor.qc
index ecf4d20aa,d6bf99fd6..f61711d2b
--- a/qcsrc/client/hud/panel/healtharmor.qc
+++ b/qcsrc/client/hud/panel/healtharmor.qc
@@@ -229,7 -229,7 +229,7 @@@ void HUD_HealthArmor(
  				HUD_Panel_DrawProgressBar(pos + health_offset, mySize, autocvar_hud_panel_healtharmor_progressbar_health, p_health/maxhealth, is_vertical, health_baralign, autocvar_hud_progressbar_health_color, autocvar_hud_progressbar_alpha * panel_fg_alpha * pain_health_alpha, DRAWFLAG_NORMAL);
  			}
  			if(autocvar_hud_panel_healtharmor_text)
- 				DrawNumIcon(pos + health_offset, mySize, floor(health), "health", is_vertical, health_iconalign, HUD_Get_Num_Color(health, maxhealth), 1);
 -				DrawNumIcon(pos + health_offset, mySize, health, "health", is_vertical, health_iconalign, HUD_Get_Num_Color(health, maxhealth, true), 1);
++				DrawNumIcon(pos + health_offset, mySize, floor(health), "health", is_vertical, health_iconalign, HUD_Get_Num_Color(health, maxhealth, true), 1);
  		}
  
  		//if(armor)
@@@ -276,7 -276,7 +276,7 @@@
  			}
  			if(!autocvar_hud_panel_healtharmor_progressbar || p_armor)
  			if(autocvar_hud_panel_healtharmor_text)
- 				DrawNumIcon(pos + armor_offset, mySize, floor(armor), "armor", is_vertical, armor_iconalign, HUD_Get_Num_Color(armor, maxarmor), 1);
 -				DrawNumIcon(pos + armor_offset, mySize, armor, "armor", is_vertical, armor_iconalign, HUD_Get_Num_Color(armor, maxarmor, true), 1);
++				DrawNumIcon(pos + armor_offset, mySize, floor(armor), "armor", is_vertical, armor_iconalign, HUD_Get_Num_Color(armor, maxarmor, true), 1);
  		}
  
  		vector cell_size = mySize;