]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Allow using offhand nades when the player has hook in their inventory
authorMario <mario@smbclan.net>
Sun, 11 Mar 2018 13:04:19 +0000 (23:04 +1000)
committerMario <mario@smbclan.net>
Sun, 11 Mar 2018 13:04:19 +0000 (23:04 +1000)
qcsrc/server/weapons/weaponsystem.qc

index 809db42710815711c3da5177035c0a1cc1affe2c..f9cae87a3639b8eabb85154f92ea9cabf5d97508 100644 (file)
@@ -576,7 +576,7 @@ void W_WeaponFrame(Player actor, .entity weaponentity)
                                key_pressed = false;
 
                        Weapon off = actor.offhand;
-                       if (off && !(actor.weapons & WEPSET(HOOK)))
+                       if (off && (!(actor.weapons & WEPSET(HOOK)) || off != OFFHAND_HOOK))
                        {
                                if (off.offhand_think) off.offhand_think(off, actor, key_pressed);
                        }