Shotgun: use secondary melee (if available) in place of primary if the player runs...

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

diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index 580be7c9eb6550163ba3f3f6dc2d42744d5e8ea9..d424507417ec5025825e619dbd1cf0ef28890dbb 100644 (file)
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -458,6 +458,10 @@ float weapon_prepareattack_checkammo(float secondary)
                for(mine = world; (mine = find(mine, classname, "mine")); ) if(mine.owner == self)
                        return FALSE;
 
+               if(self.weapon == WEP_SHOTGUN)
+               if(!secondary && WEP_CVAR(shotgun, secondary))
+                       return FALSE; // no clicking, just allow
+
                if(self.weapon == self.switchweapon && time - self.prevdryfire > 1) // only play once BEFORE starting to switch weapons
                {
                        sound (self, CH_WEAPON_A, "weapons/dryfire.wav", VOL_BASE, ATTEN_NORM);