X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fhud%2Fpanel%2Fammo.qc;h=7bae78cb6c5ab38385ea6a0b1cbdbc338be2a732;hb=387c8741f204da7abe419adbdbccccaa8110d20d;hp=fda7887b1641d74d55f3b8a2e3c9ded8e36d7874;hpb=109c5785a22fb4336ac5e91d5f1fa91678582164;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/hud/panel/ammo.qc b/qcsrc/client/hud/panel/ammo.qc
index fda7887b1..7bae78cb6 100644
--- a/qcsrc/client/hud/panel/ammo.qc
+++ b/qcsrc/client/hud/panel/ammo.qc
@@ -98,11 +98,13 @@ void HUD_Ammo()
 	if(hud != HUD_NORMAL) return;
 	if(!autocvar__hud_configure)
 	{
-		if(!autocvar_hud_panel_ammo) return;
-		if(spectatee_status == -1) return;
+		if((!autocvar_hud_panel_ammo) || (spectatee_status == -1))
+			return;
+		if(STAT(HEALTH) < 1 && autocvar_hud_panel_ammo_hide_ondeath)
+			return;
 	}
 
-	HUD_Panel_UpdateCvars();
+	HUD_Panel_LoadCvars();
 
 	draw_beginBoldFont();
 
@@ -110,7 +112,11 @@ void HUD_Ammo()
 	pos = panel_pos;
 	mySize = panel_size;
 
-	HUD_Panel_DrawBg(1);
+	if (autocvar_hud_panel_ammo_dynamichud)
+		HUD_Scale_Enable();
+	else
+		HUD_Scale_Disable();
+	HUD_Panel_DrawBg();
 	if(panel_bg_padding)
 	{
 		pos += '1 1 0' * panel_bg_padding;
@@ -144,7 +150,7 @@ void HUD_Ammo()
 
 	rows = HUD_GetRowCount(total_ammo_count, mySize, 3);
 	columns = ceil((total_ammo_count)/rows);
-	ammo_size = eX * mySize.x*(1/columns) + eY * mySize.y*(1/rows);
+	ammo_size = vec2(mySize.x / columns, mySize.y / rows);
 
 	vector offset = '0 0 0';
 	float newSize;
@@ -163,7 +169,9 @@ void HUD_Ammo()
 		ammo_size.y = newSize;
 	}
 
-	Weapon wep = switchweapon;
+	entity wepent = viewmodels[0]; // TODO: unhardcode
+
+	Weapon wep = wepent.switchweapon;
 	int i;
 	bool infinite_ammo = (STAT(ITEMS) & IT_UNLIMITED_WEAPON_AMMO);
 	row = column = 0;
@@ -199,7 +207,7 @@ void HUD_Ammo()
 		{
 			ammotype = GetAmmoFieldFromNum(i);
 			DrawAmmoItem(
-				pos + eX * column * (ammo_size.x + offset.x) + eY * row * (ammo_size.y + offset.y),
+				pos + vec2(column * (ammo_size.x + offset.x), row * (ammo_size.y + offset.y)),
 				ammo_size,
 				ammotype,
 				(wep.ammo_field == ammotype),
@@ -221,7 +229,7 @@ void HUD_Ammo()
 
 		float f = bound(0, nade_statuschange_elapsedtime*2, 1);
 
-		DrawAmmoNades(pos + eX * column * (ammo_size.x + offset.x) + eY * row * (ammo_size.y + offset.y), ammo_size, nade_prevstatus < nade_cnt && nade_cnt != 0 && f < 1, f);
+		DrawAmmoNades(pos + vec2(column * (ammo_size.x + offset.x), row * (ammo_size.y + offset.y)), ammo_size, nade_prevstatus < nade_cnt && nade_cnt != 0 && f < 1, f);
 	}
 
 	draw_endBoldFont();