From: Mario <mario@smbclan.net>
Date: Sun, 11 Mar 2018 13:04:19 +0000 (+1000)
Subject: Allow using offhand nades when the player has hook in their inventory
X-Git-Tag: xonotic-v0.8.5~2236
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=43af3ebbd11d377ec3081c8ba88be7461ffeacf3;p=xonotic%2Fxonotic-data.pk3dir.git

Allow using offhand nades when the player has hook in their inventory
---

diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index 809db4271..f9cae87a3 100644
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -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);
 			}