From 288b397b3c3b46471a1bf1518b33662cd14ed902 Mon Sep 17 00:00:00 2001
From: Samual Lenks <samual@xonotic.org>
Date: Tue, 10 Dec 2013 16:37:57 -0500
Subject: [PATCH] Fix some things with HUD

---
 qcsrc/client/hud.qc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 24c9658abe..ae8259d04b 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -775,7 +775,7 @@ void HUD_Weapons(void)
 					break;
 
 				case 3: // weapon name
-					drawstring(weapon_pos, self.netname, '1 1 0' * 0.5 * weapon_size_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+					drawstring(weapon_pos, strtolower(self.message), '1 1 0' * 0.5 * weapon_size_y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
 					break;
 
 				default: // nothing
@@ -783,7 +783,7 @@ void HUD_Weapons(void)
 			}
 
 			// draw ammo status bar
-			if(autocvar_hud_panel_weapons_ammo && self.weapon != WEP_TUBA && self.weapon != WEP_BLASTER && self.weapon != WEP_PORTO) // WEAPONTODO: detect weapons which don't have ammo automatically
+			if(autocvar_hud_panel_weapons_ammo && self.current_ammo != ammo_none)
 			{
 				a = 0;
 				ammo_type = GetAmmoTypeForWep(self.weapon);
-- 
2.39.5