Move weapon load floats in defs.qh, rather than in each weapon file. Necessary to...

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

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index f38076deb2928a0baad8ce88aec0658b1e884999..50ad77bde336ae3636f19b4109c5325aa0668915 100644 (file)
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -3,8 +3,6 @@ REGISTER_WEAPON(SHOTGUN, w_shotgun, IT_SHELLS, 2, WEP_FLAG_NORMAL | WEP_TYPE_HIT
 #else
 #ifdef SVQC
 
-.float shotgun_load;
-
 void W_Shotgun_SetAmmoCounter()
 {
        // set clip_load to the weapon we have switched to, if the gun uses reloading
@@ -69,13 +67,6 @@ void W_Shotgun_Attack (void)
        float   bulletconstant;
        local entity flash;
 
-       // if there's not enough ammo for this attack (but we still have the weapon), reload
-       if(autocvar_g_balance_shotgun_reload_ammo && self.clip_load < autocvar_g_balance_shotgun_primary_ammo)
-       {
-               W_Shotgun_Reload();
-               return;
-       }
-
        ammoamount = autocvar_g_balance_shotgun_primary_ammo;
        bullets = autocvar_g_balance_shotgun_primary_bullets;
        d = autocvar_g_balance_shotgun_primary_damage;