Rename minstanex to vaporizer

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud.qc

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 24c9658abe157307759100f1313836ef9e851399..129fbe368835a4c674c178ab583590db9ec2b670 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -426,13 +426,14 @@ float GetAmmoTypeForWep(float i) // WEAPONTODO
        switch(i)
        {
                case WEP_SHOCKWAVE: return 0;
+               case WEP_SHOTGUN: return 0;
                case WEP_UZI: return 1;
                case WEP_MORTAR: return 2;
                case WEP_MINE_LAYER: return 2;
                case WEP_ELECTRO: return 3;
                case WEP_CRYLINK: return 3;
                case WEP_HLAC: return 3;
-               case WEP_MINSTANEX: return 3;
+               case WEP_VAPORIZER: return 3;
                case WEP_NEX: return 3;
                case WEP_RIFLE: return 1;
                case WEP_HAGAR: return 2;
@@ -775,7 +776,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 +784,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);