Reload if we don't have ammo for a certain attack. Prevents situations in which you...

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

diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc
index 54bbf3652e8f9b98dd03be0f111c06f1a0f1f404..4a9ab41d31c974078936ff7cc74e3e449b57be8f 100644 (file)
--- a/qcsrc/server/w_crylink.qc
+++ b/qcsrc/server/w_crylink.qc
@@ -47,7 +47,7 @@ void W_Crylink_Reload()
        if(!autocvar_g_balance_crylink_reload_ammo)
                return;
 
-       if(!W_ReloadCheck(self.ammo_cells))
+       if(!W_ReloadCheck(self.ammo_cells, min(autocvar_g_balance_crylink_primary_ammo, autocvar_g_balance_crylink_secondary_ammo)))
                return;
 
        float t;
@@ -373,6 +373,13 @@ void W_Crylink_Attack (void)
        vector forward, right, up;
        float maxdmg;
 
+       // if there's not enough ammo for this attack (but we still have the weapon), reload
+       if(autocvar_g_balance_crylink_reload_ammo && self.clip_load < autocvar_g_balance_crylink_primary_ammo)
+       {
+               W_Crylink_Reload();
+               return;
+       }
+
        // if this weapon is reloadable, decrease its load. Else decrease the player's ammo
        if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
        {
@@ -485,6 +492,13 @@ void W_Crylink_Attack2 (void)
        local entity proj, prevproj, firstproj;
        float maxdmg;
 
+       // if there's not enough ammo for this attack (but we still have the weapon), reload
+       if(autocvar_g_balance_crylink_reload_ammo && self.clip_load < autocvar_g_balance_crylink_secondary_ammo)
+       {
+               W_Crylink_Reload();
+               return;
+       }
+
        // if this weapon is reloadable, decrease its load. Else decrease the player's ammo
        if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
        {