EVEN FURTHER cleanup of shockwave blast function :D

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

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index a78177b1991c5783e5e9b185cc5225d6a0d447d3..24c9658abe157307759100f1313836ef9e851399 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -421,13 +421,13 @@ float GetAmmoStat(float i)
        }
 }
 
-float GetAmmoTypeForWep(float i)
+float GetAmmoTypeForWep(float i) // WEAPONTODO
 {
        switch(i)
        {
-               case WEP_SHOTGUN: return 0;
+               case WEP_SHOCKWAVE: return 0;
                case WEP_UZI: return 1;
-               case WEP_GRENADE_LAUNCHER: return 2;
+               case WEP_MORTAR: return 2;
                case WEP_MINE_LAYER: return 2;
                case WEP_ELECTRO: return 3;
                case WEP_CRYLINK: return 3;
@@ -436,7 +436,7 @@ float GetAmmoTypeForWep(float i)
                case WEP_NEX: return 3;
                case WEP_RIFLE: return 1;
                case WEP_HAGAR: return 2;
-               case WEP_ROCKET_LAUNCHER: return 2;
+               case WEP_DEVASTATOR: return 2;
                case WEP_SEEKER: return 2;
                case WEP_FIREBALL: return 4;
                case WEP_HOOK: return 3;
@@ -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_LASER && self.weapon != WEP_PORTO)
+                       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
                        {
                                a = 0;
                                ammo_type = GetAmmoTypeForWep(self.weapon);