Skip melee attack for shotgun while reloading

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / w_hagar.qc

diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index 3f57c141e6b9fd8060d771c2bef54c3a26e1c691..92ca4ba0051a4d07c132be1596ac70d63a235bb0 100644 (file)
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -4,17 +4,6 @@ REGISTER_WEAPON(HAGAR, w_hagar, IT_ROCKETS, 8, WEP_FLAG_NORMAL | WEP_FLAG_RELOAD
 #ifdef SVQC
 // NO bounce protection, as bounces are limited!
 
-void W_Hagar_Reload()
-{
-       self.reload_ammo_player = ammo_rockets;
-       self.reload_ammo_min = min(autocvar_g_balance_hagar_primary_ammo, autocvar_g_balance_hagar_secondary_ammo);
-       self.reload_ammo_amount = autocvar_g_balance_hagar_reload_ammo;
-       self.reload_time = autocvar_g_balance_hagar_reload_time;
-       self.reload_sound = "weapons/reload.wav";
-
-       W_Reload();
-}
-
 void W_Hagar_Explode (void)
 {
        self.event_damage = SUB_Null;
@@ -56,17 +45,7 @@ void W_Hagar_Attack (void)
 {
        local entity missile;
 
-       // if this weapon is reloadable, decrease its load. Else decrease the player's ammo
-       if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-       {
-               if(autocvar_g_balance_hagar_reload_ammo)
-               {
-                       self.clip_load -= autocvar_g_balance_hagar_primary_ammo;
-                       self.weapon_load[WEP_HAGAR] = self.clip_load;
-               }
-               else
-                       self.ammo_rockets -= autocvar_g_balance_hagar_primary_ammo;
-       }
+       W_DecreaseAmmo(ammo_rockets, autocvar_g_balance_hagar_primary_ammo, autocvar_g_balance_hagar_reload_ammo);
 
        W_SetupShot (self, FALSE, 2, "weapons/hagar_fire.wav", CHAN_WEAPON, autocvar_g_balance_hagar_primary_damage);
 
@@ -101,17 +80,7 @@ void W_Hagar_Attack2 (void)
 {
        local entity missile;
 
-       // if this weapon is reloadable, decrease its load. Else decrease the player's ammo
-       if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-       {
-               if(autocvar_g_balance_hagar_reload_ammo)
-               {
-                       self.clip_load -= autocvar_g_balance_hagar_secondary_ammo;
-                       self.weapon_load[WEP_HAGAR] = self.clip_load;
-               }
-               else
-                       self.ammo_rockets -= autocvar_g_balance_hagar_secondary_ammo;
-       }
+       W_DecreaseAmmo(ammo_rockets, autocvar_g_balance_hagar_secondary_ammo, autocvar_g_balance_hagar_reload_ammo);
 
        W_SetupShot (self, FALSE, 2, "weapons/hagar_fire.wav", CHAN_WEAPON, autocvar_g_balance_hagar_secondary_damage);
 
@@ -162,7 +131,7 @@ float w_hagar(float req)
        else if (req == WR_THINK)
        {
                if(autocvar_g_balance_hagar_reload_ammo && self.clip_load < min(autocvar_g_balance_hagar_primary_ammo, autocvar_g_balance_hagar_secondary_ammo)) // forced reload
-                       W_Hagar_Reload();
+                       weapon_action(self.weapon, WR_RELOAD);
                else if (self.BUTTON_ATCK)
                {
                        if (weapon_prepareattack(0, autocvar_g_balance_hagar_primary_refire))
@@ -191,6 +160,7 @@ float w_hagar(float req)
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_HAGAR);
+               self.current_ammo = ammo_rockets;
        }
        else if (req == WR_CHECKAMMO1)
        {
@@ -206,7 +176,7 @@ float w_hagar(float req)
        }
        else if (req == WR_RELOAD)
        {
-               W_Hagar_Reload();
+               W_Reload(min(autocvar_g_balance_hagar_primary_ammo, autocvar_g_balance_hagar_secondary_ammo), autocvar_g_balance_hagar_reload_ammo, autocvar_g_balance_hagar_reload_time, "weapons/reload.wav");
        }
        return TRUE;
 };