Merge branch 'master' into Mario/wepent_experimental

[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 18675f0d5763b8d91b49588f2a695d22eb21c639..2e0ee09bf8df718d593943e4a777f0b99d1627b5 100644 (file)
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -76,6 +76,7 @@ void CL_Weaponentity_Think(entity this)
        {
                // owner has new gun; remove old one
                if (this.weaponchild) delete(this.weaponchild);
+               if (this.hook) delete(this.hook);
                delete(this);
                return;
        }
@@ -454,7 +455,6 @@ void W_WeaponFrame(Player actor, .entity weaponentity)
                this.m_switchingweapon = WEP_Null;
                this.state = WS_CLEAR;
                this.weaponname = "";
-               // actor.items &= ~IT_AMMO;
                return;
        }